@@ -160,6 +160,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
}
dev->archdata.acpi_handle = handle;
+ acpi_pci_bind_notify(dev->archdata.acpi_handle, dev, true);
+
status = acpi_bus_get_device(handle, &acpi_dev);
if (!ACPI_FAILURE(status)) {
int ret;
@@ -191,6 +193,8 @@ static int acpi_unbind_one(struct device *dev)
sysfs_remove_link(&acpi_dev->dev.kobj, "physical_node");
}
+ acpi_pci_bind_notify(dev->archdata.acpi_handle, dev, false);
+
acpi_detach_data(dev->archdata.acpi_handle,
acpi_glue_data_handler);
dev->archdata.acpi_handle = NULL;
@@ -93,4 +93,6 @@ static inline int suspend_nvs_save(void) { return 0; }
static inline void suspend_nvs_restore(void) {}
#endif
+void acpi_pci_bind_notify(acpi_handle handle, struct device *dev, bool bind);
+
#endif /* _ACPI_INTERNAL_H_ */
@@ -35,54 +35,56 @@
#define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_bind");
-static int acpi_pci_unbind(struct acpi_device *device)
-{
- struct pci_dev *dev;
+static int acpi_pci_bind(struct acpi_device *device);
- dev = acpi_get_pci_dev(device->handle);
- if (!dev)
- goto out;
-
- device_set_run_wake(&dev->dev, false);
+static int __acpi_pci_unbind(struct acpi_device *device, struct pci_dev *pdev)
+{
+ device_set_run_wake(&pdev->dev, false);
pci_acpi_remove_pm_notifier(device);
- if (!dev->subordinate)
- goto out;
+ if (pdev->subordinate) {
+ acpi_pci_irq_del_prt(pdev->subordinate);
+ device->ops.bind = NULL;
+ device->ops.unbind = NULL;
+ }
- acpi_pci_irq_del_prt(dev->subordinate);
+ return 0;
+}
- device->ops.bind = NULL;
- device->ops.unbind = NULL;
+static int acpi_pci_unbind(struct acpi_device *device)
+{
+ int rc = 0;
+ struct pci_dev *pdev;
-out:
- pci_dev_put(dev);
- return 0;
+ pdev = acpi_get_pci_dev(device->handle);
+ if (pdev) {
+ rc = __acpi_pci_unbind(device, pdev);
+ pci_dev_put(pdev);
+ }
+
+ return rc;
}
-static int acpi_pci_bind(struct acpi_device *device)
+static int __acpi_pci_bind(struct acpi_device *device, struct pci_dev *pdev)
{
acpi_status status;
acpi_handle handle;
struct pci_bus *bus;
- struct pci_dev *dev;
- dev = acpi_get_pci_dev(device->handle);
- if (!dev)
- return 0;
-
- pci_acpi_add_pm_notifier(device, dev);
+ pci_acpi_add_pm_notifier(device, pdev);
if (device->wakeup.flags.run_wake)
- device_set_run_wake(&dev->dev, true);
+ device_set_run_wake(&pdev->dev, true);
/*
* Install the 'bind' function to facilitate callbacks for
* children of the P2P bridge.
*/
- if (dev->subordinate) {
+ if (pdev->subordinate) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Device %04x:%02x:%02x.%d is a PCI bridge\n",
- pci_domain_nr(dev->bus), dev->bus->number,
- PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)));
+ pci_domain_nr(pdev->bus), pdev->bus->number,
+ PCI_SLOT(pdev->devfn),
+ PCI_FUNC(pdev->devfn)));
device->ops.bind = acpi_pci_bind;
device->ops.unbind = acpi_pci_unbind;
}
@@ -96,19 +98,29 @@ static int acpi_pci_bind(struct acpi_device *device)
* TBD: Can _PRTs exist within the scope of non-bridge PCI devices?
*/
status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
- if (ACPI_FAILURE(status))
- goto out;
+ if (ACPI_SUCCESS(status)) {
+ if (pdev->subordinate)
+ bus = pdev->subordinate;
+ else
+ bus = pdev->bus;
+ acpi_pci_irq_add_prt(device->handle, bus);
+ }
+
+ return 0;
+}
- if (dev->subordinate)
- bus = dev->subordinate;
- else
- bus = dev->bus;
+static int acpi_pci_bind(struct acpi_device *device)
+{
+ int rc = 0;
+ struct pci_dev *pdev;
- acpi_pci_irq_add_prt(device->handle, bus);
+ pdev = acpi_get_pci_dev(device->handle);
+ if (pdev) {
+ rc = __acpi_pci_bind(device, pdev);
+ pci_dev_put(pdev);
+ }
-out:
- pci_dev_put(dev);
- return 0;
+ return rc;
}
int acpi_pci_bind_root(struct acpi_device *device)
@@ -118,3 +130,20 @@ int acpi_pci_bind_root(struct acpi_device *device)
return 0;
}
+
+void acpi_pci_bind_notify(acpi_handle handle, struct device *dev, bool bind)
+{
+ struct acpi_device *acpi_dev;
+
+ if (!dev_is_pci(dev))
+ return;
+ if (acpi_bus_get_device(handle, &acpi_dev))
+ return;
+ if (!acpi_dev || !acpi_dev->parent)
+ return;
+
+ if (bind && acpi_dev->parent->ops.bind)
+ __acpi_pci_bind(acpi_dev, to_pci_dev(dev));
+ else if (acpi_dev->parent->ops.unbind)
+ __acpi_pci_unbind(acpi_dev, to_pci_dev(dev));
+}
@@ -195,21 +195,6 @@ static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
return AE_OK;
}
-static void acpi_pci_bridge_scan(struct acpi_device *device)
-{
- int status;
- struct acpi_device *child = NULL;
-
- if (device->flags.bus_address)
- if (device->parent && device->parent->ops.bind) {
- status = device->parent->ops.bind(device);
- if (!status) {
- list_for_each_entry(child, &device->children, node)
- acpi_pci_bridge_scan(child);
- }
- }
-}
-
static u8 pci_osc_uuid_str[] = "33DB4D5B-1FF7-401C-9657-7441C03DD766";
static acpi_status acpi_pci_run_osc(acpi_handle handle,
@@ -456,7 +441,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
int result;
struct acpi_pci_root *root;
acpi_handle handle;
- struct acpi_device *child;
u32 flags, base_flags;
root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
@@ -557,12 +541,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
if (ACPI_SUCCESS(status))
result = acpi_pci_irq_add_prt(device->handle, root->bus);
- /*
- * Scan and bind all _ADR-Based Devices
- */
- list_for_each_entry(child, &device->children, node)
- acpi_pci_bridge_scan(child);
-
/* Indicate support for various _OSC capabilities. */
if (pci_ext_cfg_avail(root->bus->self))
flags |= OSC_EXT_PCI_CONFIG_SUPPORT;