lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI Hotplug: acpiphp: get pci_bus from acpi handle correctly

Browse Source 
We cannot simply call acpi_get_pci_dev() on any random ACPI handle
and hope that it works, because a PCI root bridge may not have
an associated struct pci_dev.

This is allowed per the PCI specification, and is referred to as a
non-materialized bridge.

So, depending on the type of PCI bridge that the handle points to,
use the appropriate interface to return the struct pci_bus correctly.

Reviewed-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Alex Chiang
2009-07-23 17:03:05 -06:00
committed by Jesse Barnes
parent 76d56de57a
commit 5228a828ee
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/pci/hotplug/acpiphp_glue.c
View File

@@ -62,6 +62,22 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus);
static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus); static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus);
static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context); static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context);
static struct pci_bus *pci_bus_from_handle(acpi_handle handle)
{
struct pci_bus *pbus;
struct acpi_pci_root *root;
root = acpi_pci_find_root(handle);
if (root)
pbus = root->bus;
else {
struct pci_dev *pdev = acpi_get_pci_dev(handle);
pbus = pdev->subordinate;
pci_dev_put(pdev);
}
return pbus;
}
/* callback routine to check for the existence of a pci dock device */ /* callback routine to check for the existence of a pci dock device */
static acpi_status static acpi_status
is_pci_dock_device(acpi_handle handle, u32 lvl, void *context, void **rv) is_pci_dock_device(acpi_handle handle, u32 lvl, void *context, void **rv)
@@ -1387,16 +1403,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
/* Program resources in newly inserted bridge */ /* Program resources in newly inserted bridge */
static int acpiphp_configure_bridge (acpi_handle handle) static int acpiphp_configure_bridge (acpi_handle handle)
{ {
struct pci_dev *dev; struct pci_bus *bus = pci_bus_from_handle(handle);
struct pci_bus *bus;
dev = acpi_get_pci_dev(handle);
if (!dev) {
err("cannot get PCI domain and bus number for bridge\n");
return -EINVAL;
}
bus = dev->bus;
pci_bus_size_bridges(bus); pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus); pci_bus_assign_resources(bus);
@@ -1404,7 +1411,6 @@ static int acpiphp_configure_bridge (acpi_handle handle)
acpiphp_set_hpp_values(handle, bus); acpiphp_set_hpp_values(handle, bus);
pci_enable_bridges(bus); pci_enable_bridges(bus);
acpiphp_configure_ioapics(handle); acpiphp_configure_ioapics(handle);
pci_dev_put(dev);
return 0; return 0;
} }