Now ACPI devices are created before/destroyed after corresponding PCI
devices, and acpi_platform_notify/acpi_platform_notify_remove will
update PCI<->ACPI binding relationship when creating/destroying PCI
devices, there's no need to invoke bind/unbind callbacks from ACPI
device probe/destroy routines anymore. So remove bind/unbind callbacks
from acpi_device_ops.
Signed-off-by: Jiang Liu <jiang....@huawei.com>
Signed-off-by: Yijing Wang <wangyij...@huawei.com>
---
V2->V3:
Simplify implementation according to Yinghai's suggestion.
---
drivers/acpi/glue.c | 15 ++++---
drivers/acpi/internal.h | 3 +-
drivers/acpi/pci_bind.c | 102 ++++++++++---------------------------------
drivers/acpi/pci_root.c | 9 ----
drivers/acpi/scan.c | 21 +--------
include/acpi/acpi_bus.h | 4 --
include/acpi/acpi_drivers.h | 1 -
7 files changed, 36 insertions(+), 119 deletions(-)
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4904700..9779fb7 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -160,10 +160,13 @@ 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)) {
+ if (!ACPI_FAILURE(status))
+ acpi_dev = NULL;
+
+ acpi_pci_bind_notify(dev->archdata.acpi_handle, acpi_dev, dev, true);
+
+ if (acpi_dev) {
int ret;
ret = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
@@ -191,9 +194,11 @@ static int acpi_unbind_one(struct device *dev)
&acpi_dev)) {
sysfs_remove_link(&dev->kobj, "firmware_node");
sysfs_remove_link(&acpi_dev->dev.kobj, "physical_node");
- }
+ } else
+ acpi_dev = NULL;
- acpi_pci_bind_notify(dev->archdata.acpi_handle, dev, false);
+ acpi_pci_bind_notify(dev->archdata.acpi_handle, acpi_dev, dev,
+ false);
acpi_detach_data(dev->archdata.acpi_handle,
acpi_glue_data_handler);
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 5396b20..ac7e647 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -93,6 +93,7 @@ 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);
+void acpi_pci_bind_notify(acpi_handle handle, struct acpi_device *acpi_dev,
+ struct device *dev, bool bind);
#endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 320e698..75846a7 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -35,57 +35,30 @@
#define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_bind");
-static int acpi_pci_bind_cb(struct acpi_device *device);
-
-static int acpi_pci_unbind(struct acpi_device *device, struct pci_dev *dev)
+static int acpi_pci_unbind(struct acpi_device *acpi_dev, struct pci_dev *dev)
{
- device_set_run_wake(&dev->dev, false);
- pci_acpi_remove_pm_notifier(device);
+ if (acpi_dev) {
+ device_set_run_wake(&dev->dev, false);
+ pci_acpi_remove_pm_notifier(acpi_dev);
+ }
- if (dev->subordinate) {
+ if (dev->subordinate)
acpi_pci_irq_del_prt(dev->subordinate);
- device->ops.bind = NULL;
- device->ops.unbind = NULL;
- }
return 0;
}
-static int acpi_pci_unbind_cb(struct acpi_device *device)
-{
- int rc = 0;
- struct pci_dev *dev;
-
- dev = acpi_get_pci_dev(device->handle);
- if (dev) {
- rc = acpi_pci_unbind(device, dev);
- pci_dev_put(dev);
- }
-
- return rc;
-}
-
-static int acpi_pci_bind(struct acpi_device *device, struct pci_dev *dev)
+static int acpi_pci_bind(acpi_handle handle, struct acpi_device *acpi_dev,
+ struct pci_dev *dev)
{
acpi_status status;
- acpi_handle handle;
struct pci_bus *bus;
+ acpi_handle tmp_hdl;
- pci_acpi_add_pm_notifier(device, dev);
- if (device->wakeup.flags.run_wake)
- device_set_run_wake(&dev->dev, true);
-
- /*
- * Install the 'bind' function to facilitate callbacks for
- * children of the P2P bridge.
- */
- if (dev->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)));
- device->ops.bind = acpi_pci_bind_cb;
- device->ops.unbind = acpi_pci_unbind_cb;
+ if (acpi_dev) {
+ pci_acpi_add_pm_notifier(acpi_dev, dev);
+ if (acpi_dev->wakeup.flags.run_wake)
+ device_set_run_wake(&dev->dev, true);
}
/*
@@ -96,56 +69,25 @@ static int acpi_pci_bind(struct acpi_device *device, struct
pci_dev *dev)
*
* TBD: Can _PRTs exist within the scope of non-bridge PCI devices?
*/
- status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
+ status = acpi_get_handle(handle, METHOD_NAME__PRT, &tmp_hdl);
if (ACPI_SUCCESS(status)) {
if (dev->subordinate)
bus = dev->subordinate;
else
bus = dev->bus;
- acpi_pci_irq_add_prt(device->handle, bus);
- }
-
- return 0;
-}
-
-static int acpi_pci_bind_cb(struct acpi_device *device)
-{
- int rc = 0;
- struct pci_dev *dev;
-
- dev = acpi_get_pci_dev(device->handle);
- if (dev) {
- rc = acpi_pci_bind(device, dev);
- pci_dev_put(dev);
+ acpi_pci_irq_add_prt(handle, bus);
}
- return rc;
-}
-
-int acpi_pci_bind_root(struct acpi_device *device)
-{
- device->ops.bind = acpi_pci_bind_cb;
- device->ops.unbind = acpi_pci_unbind_cb;
-
return 0;
}
-void acpi_pci_bind_notify(acpi_handle handle, struct device *dev, bool bind)
+void acpi_pci_bind_notify(acpi_handle handle, struct acpi_device *acpi_dev,
+ struct device *dev, bool bind)
{
- struct acpi_device *acpi_dev;
-
- if (!dev_is_pci(dev))
- return;
- if (acpi_bus_get_device(handle, &acpi_dev) || !acpi_dev)
- return;
-
- if (acpi_dev->parent) {
- if (bind) {
- if (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));
- }
+ if (dev_is_pci(dev)) {
+ if (bind)
+ acpi_pci_bind(handle, acpi_dev, to_pci_dev(dev));
+ else
+ acpi_pci_unbind(acpi_dev, to_pci_dev(dev));
}
}
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 7509034..25d8ad4 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -505,15 +505,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device
*device)
/* TBD: Locking */
list_add_tail(&root->node, &acpi_pci_roots);
- /*
- * Attach ACPI-PCI Context
- * -----------------------
- * Thus binding the ACPI and PCI devices.
- */
- result = acpi_pci_bind_root(device);
- if (result)
- goto end;
-
printk(KERN_INFO PREFIX "%s [%s] (domain %04x %pR)\n",
acpi_device_name(device), acpi_device_bid(device),
root->segment, &root->secondary);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index d1ecca2..f31cb2f 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1232,17 +1232,8 @@ static int acpi_bus_remove(struct acpi_device *dev, int
rmdevice)
dev->removal_type = ACPI_BUS_REMOVAL_EJECT;
device_release_driver(&dev->dev);
- if (!rmdevice)
- return 0;
-
- /*
- * unbind _ADR-Based Devices when hot removal
- */
- if (dev->flags.bus_address) {
- if ((dev->parent) && (dev->parent->ops.unbind))
- dev->parent->ops.unbind(dev);
- }
- acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
+ if (rmdevice)
+ acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
return 0;
}
@@ -1319,14 +1310,6 @@ static int acpi_add_single_object(struct acpi_device
**child,
result = acpi_device_register(device);
- /*
- * Bind _ADR-Based Devices when hot add
- */
- if (device->flags.bus_address) {
- if (device->parent && device->parent->ops.bind)
- device->parent->ops.bind(device);
- }
-
end:
if (!result) {
acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index bde976e..ef5babf 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -120,8 +120,6 @@ struct acpi_device;
typedef int (*acpi_op_add) (struct acpi_device * device);
typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
typedef int (*acpi_op_start) (struct acpi_device * device);
-typedef int (*acpi_op_bind) (struct acpi_device * device);
-typedef int (*acpi_op_unbind) (struct acpi_device * device);
typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);
struct acpi_bus_ops {
@@ -133,8 +131,6 @@ struct acpi_device_ops {
acpi_op_add add;
acpi_op_remove remove;
acpi_op_start start;
- acpi_op_bind bind;
- acpi_op_unbind unbind;
acpi_op_notify notify;
};
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index bb145e4..fb1c0d5 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -100,7 +100,6 @@ void acpi_pci_irq_del_prt(struct pci_bus *bus);
struct pci_bus;
struct pci_dev *acpi_get_pci_dev(acpi_handle);
-int acpi_pci_bind_root(struct acpi_device *device);
/* Arch-defined function to add a bus to the system */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
