In commit 40e7fcb1929(ACPI: Add _DEP support to fix battery issue on Asus
T100TA), the '_DEP' was supported to solve the dependency of Asus battery. But
this patch is specific to Asus battery device.
In the real world, there are other devices which need the dependency to play the
role on the enumeration order. For example, all the Hip06 LPC
periperals(IPMI-BT, uart, etc) must be scanned after the LPC host driver
finished the probing. So, it makes sense to add a checking whether the ACPI
device meet all the dependencies during its enumeration slot, if not, the
enumeration will be delayed till all dependency master finish their work.
This patch adds the dependency checking in ACPI enumeration, also the
corresponding handling to retrigger the Hip06 LPC peripherals' scanning.
Signed-off-by: zhichang.yuan <yuanzhichang@xxxxxxxxxxxxx>
---
drivers/acpi/battery.c | 3 ---
drivers/acpi/scan.c | 3 +++
drivers/bus/hisi_lpc.c | 12 +++++++++++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 4ef1e46..e8d1af1 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1210,9 +1210,6 @@ static int acpi_battery_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- if (device->dep_unmet)
- return -EPROBE_DEFER;
-
battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
if (!battery)
return -ENOMEM;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1926918..97721b1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1843,6 +1843,9 @@ static void acpi_bus_attach(struct acpi_device *device)
if (device->handler)
goto ok;
+ if (device->dep_unmet)
+ return;
+
if (!device->flags.initialized) {
device->flags.power_manageable =
device->power.states[ACPI_STATE_D0].flags.valid;
diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
index 03cf19a..345ea12 100644
--- a/drivers/bus/hisi_lpc.c
+++ b/drivers/bus/hisi_lpc.c
@@ -516,8 +516,18 @@ static int hisilpc_probe(struct platform_device *pdev)
/*
* It is time to start the children scannings....
+ * For ACPI children, the corresponding devices will be created after
+ * retriggering the ACPI scanning by removing the dependency blocking.
*/
- if (!has_acpi_companion(dev)) {
+ if (has_acpi_companion(dev)) {
+ struct acpi_device *adev;
+
+ adev = to_acpi_device_node(dev->fwnode);
+ if (!adev)
+ ret = -ENODEV;
+ else
+ acpi_walk_dep_device_list(adev->handle);
+ } else {
ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
if (ret)
dev_err(dev, "OF: enumerate LPC bus fail(%d)\n", ret);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
