From patchwork Wed Jan 28 11:51:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 4212 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 n0SBpj2C031106 for ; Wed, 28 Jan 2009 11:51:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751011AbZA1Lvo (ORCPT ); Wed, 28 Jan 2009 06:51:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751391AbZA1Lvo (ORCPT ); Wed, 28 Jan 2009 06:51:44 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:36859 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbZA1Lvn (ORCPT ); Wed, 28 Jan 2009 06:51:43 -0500 Received: from mt1.gw.fujitsu.co.jp ([10.0.50.74]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n0SBpfxN026212 (envelope-from kaneshige.kenji@jp.fujitsu.com); Wed, 28 Jan 2009 20:51:41 +0900 Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 3FF5E45DE51; Wed, 28 Jan 2009 20:51:41 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 1CE5C45DE4F; Wed, 28 Jan 2009 20:51:41 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 01AF91DB8043; Wed, 28 Jan 2009 20:51:41 +0900 (JST) Received: from m107.s.css.fujitsu.com (m107.s.css.fujitsu.com [10.249.87.107]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id AA9031DB8040; Wed, 28 Jan 2009 20:51:40 +0900 (JST) Received: from m107.css.fujitsu.com (m107 [127.0.0.1]) by m107.s.css.fujitsu.com (Postfix) with ESMTP id 7B9912C00B9; Wed, 28 Jan 2009 20:51:40 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by m107.s.css.fujitsu.com (Postfix) with ESMTP id DE8232C00A8; Wed, 28 Jan 2009 20:51:39 +0900 (JST) Message-ID: <498046BE.1000809@jp.fujitsu.com> Date: Wed, 28 Jan 2009 20:51:26 +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 3/8] PCI hotplug: fix wrong assumption in acpi_get_hp_params_from_firmware 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_get_hp_params_from_firmware() has a 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 acpi_get_hp_params_from_firmware() might cause endless loop. We must check pci_bus->parent instead. Signed-off-by: Kenji Kaneshige --- drivers/pci/hotplug/acpi_pcihp.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 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/drivers/pci/hotplug/acpi_pcihp.c =================================================================== --- linux-2.6.29-rc2.orig/drivers/pci/hotplug/acpi_pcihp.c +++ linux-2.6.29-rc2/drivers/pci/hotplug/acpi_pcihp.c @@ -333,19 +333,14 @@ acpi_status acpi_get_hp_params_from_firm { acpi_status status = AE_NOT_FOUND; acpi_handle handle, phandle; - struct pci_bus *pbus = bus; - struct pci_dev *pdev; + struct pci_bus *pbus; - do { - pdev = pbus->self; - if (!pdev) { - handle = acpi_get_pci_rootbridge_handle( - pci_domain_nr(pbus), pbus->number); + handle = NULL; + for (pbus = bus; pbus; pbus = pbus->parent) { + handle = acpi_pci_get_bridge_handle(pbus); + if (handle) break; - } - handle = DEVICE_ACPI_HANDLE(&(pdev->dev)); - pbus = pbus->parent; - } while (!handle); + } /* * _HPP settings apply to all child buses, until another _HPP is