From kaneshige.kenji@jp.fujitsu.com Mon Feb 27 05:17:54 2006 Message-ID: <4402FB85.2010608@jp.fujitsu.com> Date: Mon, 27 Feb 2006 22:15:49 +0900 From: Kenji Kaneshige To: pcihpd-discuss@lists.sourceforge.net, Greg KH Subject: acpiphp: Scan slots under the nested P2P bridge Current ACPIPHP driver scans only slots under the top level PCI-to-PCI bridge. So hotplug PCI slots under the nested PCI-to-PCI bridge would not be detected. For example, if the system has the ACPI namespace like below, hotplug slots woule not be detected. Device (PCI0) { /* Root bridge */ Name (_HID, "PNP0A03") Device (P2PA) { /* PCI-to-PCI bridge */ Name (_ADR, ...) Device (P2PB) { /* PCI-to-PCI bridge */ Name (_ADR, ...) Device (S0F0) { /* hotplug slot */ Name (_ADR, ...) Name (_SUN, ...) Method (_EJ0, ...) { ... } } ... Device (S0F7) { /* hotplug slot */ Name (_ADR, ...) Name (_SUN, ...) Method (_EJ0, ...) { ... } } Device (S1F0) { /* hotplug slot */ Name (_ADR, ...) Name (_SUN, ...) Method (_EJ0, ...) { ... } } ... } } } This patch fixes this issue. Signed-off-by: Kenji Kaneshige Signed-off-by: Greg Kroah-Hartman --- drivers/pci/hotplug/acpiphp_glue.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- gregkh-2.6.orig/drivers/pci/hotplug/acpiphp_glue.c +++ gregkh-2.6/drivers/pci/hotplug/acpiphp_glue.c @@ -463,6 +463,12 @@ find_p2p_bridge(acpi_handle handle, u32 add_p2p_bridge(handle, dev); } + /* search P2P bridges under this p2p bridge */ + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1, + find_p2p_bridge, dev->subordinate, NULL); + if (ACPI_FAILURE(status)) + warn("find_p2p_bridge faied (error code = 0x%x)\n", status); + out: pci_dev_put(dev); return AE_OK; @@ -603,7 +609,8 @@ static void remove_bridge(acpi_handle ha } else { /* clean-up p2p bridges under this host bridge */ acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, - (u32)1, cleanup_p2p_bridge, NULL, NULL); + ACPI_UINT32_MAX, cleanup_p2p_bridge, + NULL, NULL); } }