From patchwork Fri Jan 11 22:40:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 1967941 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 774B9E00D8 for ; Fri, 11 Jan 2013 22:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755050Ab3AKWno (ORCPT ); Fri, 11 Jan 2013 17:43:44 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:38450 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756053Ab3AKWlV (ORCPT ); Fri, 11 Jan 2013 17:41:21 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0BMf8K0013530 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Jan 2013 22:41:09 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0BMf7Kk003157 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 11 Jan 2013 22:41:08 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0BMf7mc029569; Fri, 11 Jan 2013 16:41:07 -0600 Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 11 Jan 2013 14:41:07 -0800 From: Yinghai Lu To: Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown , Taku Izumi , Jiang Liu Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu Subject: [PATCH v8 11/22] PCI: correctly detect ACPI PCI host bridge objects Date: Fri, 11 Jan 2013 14:40:38 -0800 Message-Id: <1357944049-29620-12-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357944049-29620-1-git-send-email-yinghai@kernel.org> References: <1357944049-29620-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu The code in pci_root_hp.c depends on function acpi_is_root_bridge() to check whether an ACPI object is a PCI host bridge or not. If an ACPI device hasn't been created for the ACPI object yet, function acpi_is_root_bridge() will return false even if the object is a PCI host bridge object. That behavior will cause two issues: 1) No ACPI notification handler installed for PCI host bridges absent at startup, so hotplug events for those bridges won't be handled. 2) rescan_root_bridge() can't reenumerate offlined PCI host bridges because the ACPI devices have been already destroyed. So use acpi_match_object_info_ids() to correctly detect PCI host bridges. -v2: update to use acpi_match_object_info_ids() from Tang Chen - Yinghai -v3: drop the PNP0A008, according to Bjorn. Signed-off-by: Jiang Liu Signed-off-by: Yinghai Lu Cc: Len Brown Cc: linux-acpi@vger.kernel.org --- drivers/acpi/pci_root.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 5ae36d8..d30fb94 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -923,6 +923,23 @@ static void handle_hotplug_event_root(acpi_handle handle, u32 type, _handle_hotplug_event_root); } +static bool acpi_is_root_bridge_object(acpi_handle handle) +{ + struct acpi_device_info *info = NULL; + acpi_status status; + bool ret; + + status = acpi_get_object_info(handle, &info); + if (ACPI_FAILURE(status)) + return false; + + ret = !acpi_match_object_info_ids(info, root_device_ids); + + kfree(info); + + return ret; +} + static acpi_status __init find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv) { @@ -931,7 +948,7 @@ find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv) .pointer = objname }; int *count = (int *)context; - if (!acpi_is_root_bridge(handle)) + if (!acpi_is_root_bridge_object(handle)) return AE_OK; (*count)++;