From patchwork Wed Jan 28 11:59:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 4222 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 n0SC0AP0031624 for ; Wed, 28 Jan 2009 12:00:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752032AbZA1MAJ (ORCPT ); Wed, 28 Jan 2009 07:00:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751910AbZA1MAJ (ORCPT ); Wed, 28 Jan 2009 07:00:09 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:37296 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751461AbZA1MAH (ORCPT ); Wed, 28 Jan 2009 07:00:07 -0500 Received: from m5.gw.fujitsu.co.jp ([10.0.50.75]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n0SC0508030502 (envelope-from kaneshige.kenji@jp.fujitsu.com); Wed, 28 Jan 2009 21:00:06 +0900 Received: from smail (m5 [127.0.0.1]) by outgoing.m5.gw.fujitsu.co.jp (Postfix) with ESMTP id 9CF0645DE56; Wed, 28 Jan 2009 21:00:05 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (s5.gw.fujitsu.co.jp [10.0.50.95]) by m5.gw.fujitsu.co.jp (Postfix) with ESMTP id 653F445DE53; Wed, 28 Jan 2009 21:00:05 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id F23651DB805D; Wed, 28 Jan 2009 21:00:04 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.249.87.103]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 9B1FB1DB8043; Wed, 28 Jan 2009 21:00:04 +0900 (JST) Received: from ml13.css.fujitsu.com (ml13 [127.0.0.1]) by ml13.s.css.fujitsu.com (Postfix) with ESMTP id 7C146FD0002; Wed, 28 Jan 2009 21:00:04 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by ml13.s.css.fujitsu.com (Postfix) with ESMTP id C730BFD0001; Wed, 28 Jan 2009 21:00:03 +0900 (JST) Message-ID: <498048B6.20203@jp.fujitsu.com> Date: Wed, 28 Jan 2009 20:59:50 +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 8/8] PCI: fix wrong assumption in pci_common_swizzle 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_common_swizzle() seems to have a assumption that pci_bus->self is NULL on the pci root bus. But it might not be true on some platforms. Because of this wrong assumption, pci_common_swizzle() might cause endless loop. We must check pci_bus->parent instead. Signed-off-by: Kenji Kaneshige --- drivers/pci/pci.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/pci.c =================================================================== --- linux-2.6.29-rc2.orig/drivers/pci/pci.c +++ linux-2.6.29-rc2/drivers/pci/pci.c @@ -1453,7 +1453,7 @@ u8 pci_common_swizzle(struct pci_dev *de { u8 pin = *pinp; - while (dev->bus->self) { + while (dev->bus->parent) { pin = pci_swizzle_interrupt_pin(dev, pin); dev = dev->bus->self; }