From patchwork Wed Jan 28 11:50:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 4210 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0SBom7Z031043 for ; Wed, 28 Jan 2009 11:50:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751552AbZA1Lur (ORCPT ); Wed, 28 Jan 2009 06:50:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751391AbZA1Lur (ORCPT ); Wed, 28 Jan 2009 06:50:47 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:36802 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbZA1Luq (ORCPT ); Wed, 28 Jan 2009 06:50:46 -0500 Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n0SBoifW025722 (envelope-from kaneshige.kenji@jp.fujitsu.com); Wed, 28 Jan 2009 20:50:44 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id EAF5345DD76; Wed, 28 Jan 2009 20:50:43 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id CA15F45DD74; Wed, 28 Jan 2009 20:50:43 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id AF091E08006; Wed, 28 Jan 2009 20:50:43 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.249.87.103]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 65FC7E08005; Wed, 28 Jan 2009 20:50:43 +0900 (JST) Received: from ml13.css.fujitsu.com (ml13 [127.0.0.1]) by ml13.s.css.fujitsu.com (Postfix) with ESMTP id 3D247FD0002; Wed, 28 Jan 2009 20:50:43 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by ml13.s.css.fujitsu.com (Postfix) with ESMTP id AD4E1FD0001; Wed, 28 Jan 2009 20:50:42 +0900 (JST) Message-ID: <49804685.5030404@jp.fujitsu.com> Date: Wed, 28 Jan 2009 20:50:29 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: linux-pci@vger.kernel.org, "Barnes, Jesse" CC: James Bottomley , Len Brown , linux-acpi@vger.kernel.org, linux-kernel , shaohua.li@intel.com, Grant Grundler Subject: [PATCH 2/8] PCI/ACPI: fix wrong assumption in acpi_find_root_bridge_handle References: <1231604250.3642.33.camel@localhost.localdomain> <1231807693.27151.21.camel@localhost.localdomain> <1232046108.5966.57.camel@localhost.localdomain> <1232049269.5966.64.camel@localhost.localdomain> <1232050347.5966.66.camel@localhost.localdomain> <4970242C.4010404@jp.fujitsu.com> <1232115546.3224.5.camel@localhost.localdomain> <4973D2EE.3060203@jp.fujitsu.com> <1232328216.3247.68.camel@localhost.localdomain> <4973EF64.2050404@jp.fujitsu.com> <1232558780.736.24.camel@localhost.localdomain> <497D1BD7.9000609@jp.fujitsu.com> <498045D1.60005@jp.fujitsu.com> In-Reply-To: <498045D1.60005@jp.fujitsu.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Current acpi_find_root_bridge_handle() has a assumption that pci_bus->self is NULL on the root pci bus. But it might not be true on some platforms. Because of this wrong assumption, current acpi_find_root_bridge_handle() might cause endless loop. We must check pci_bus->parent instead. Signed-off-by: Kenji Kaneshige --- include/linux/pci-acpi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6.29-rc2/include/linux/pci-acpi.h =================================================================== --- linux-2.6.29-rc2.orig/include/linux/pci-acpi.h +++ linux-2.6.29-rc2/include/linux/pci-acpi.h @@ -53,12 +53,12 @@ extern acpi_status pci_osc_control_set(a int pci_acpi_osc_support(acpi_handle handle, u32 flags); static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) { - /* Find root host bridge */ - while (pdev->bus->self) - pdev = pdev->bus->self; - - return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), - pdev->bus->number); + struct pci_bus *pbus = pdev->bus; + /* Find a PCI root bus */ + while (pbus->parent) + pbus = pbus->parent; + return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), + pbus->number); } static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)