From patchwork Wed Jan 28 11:56:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 4216 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 n0SBug5c031402 for ; Wed, 28 Jan 2009 11:56:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751812AbZA1L4l (ORCPT ); Wed, 28 Jan 2009 06:56:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751445AbZA1L4k (ORCPT ); Wed, 28 Jan 2009 06:56:40 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:37147 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750740AbZA1L4j (ORCPT ); Wed, 28 Jan 2009 06:56:39 -0500 Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n0SBubcS028856 (envelope-from kaneshige.kenji@jp.fujitsu.com); Wed, 28 Jan 2009 20:56:38 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id C748645DD74; Wed, 28 Jan 2009 20:56:37 +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 A6DAD45DD72; Wed, 28 Jan 2009 20:56:37 +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 995551DB803E; Wed, 28 Jan 2009 20:56:37 +0900 (JST) Received: from m106.s.css.fujitsu.com (m106.s.css.fujitsu.com [10.249.87.106]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 4EFD11DB8041; Wed, 28 Jan 2009 20:56:37 +0900 (JST) Received: from m106.css.fujitsu.com (m106 [127.0.0.1]) by m106.s.css.fujitsu.com (Postfix) with ESMTP id 14F275B8560; Wed, 28 Jan 2009 20:56:37 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by m106.s.css.fujitsu.com (Postfix) with ESMTP id 796175B84BA; Wed, 28 Jan 2009 20:56:36 +0900 (JST) Message-ID: <498047E6.4070605@jp.fujitsu.com> Date: Wed, 28 Jan 2009 20:56:22 +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 5/8] PCI: fix wrong assumption in pci_find_upstream_pcie_bridge 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 pci_find_upstream_pcie_bridge() has a wrong assumption that pci_bus->self is NULL on the root pci bus. But it might not true on some platforms. Because of this wrong assumption, current pci_find_upstream_pcie_bridge() might cause endless loop. We must check pci_bus->parent instead. Signed-off-by: Kenji Kaneshige --- drivers/pci/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/drivers/pci/search.c =================================================================== --- linux-2.6.29-rc2.orig/drivers/pci/search.c +++ linux-2.6.29-rc2/drivers/pci/search.c @@ -29,7 +29,7 @@ pci_find_upstream_pcie_bridge(struct pci if (pdev->is_pcie) return NULL; while (1) { - if (!pdev->bus->self) + if (!pdev->bus->parent) break; pdev = pdev->bus->self; /* a p2p bridge */