hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAKLPG
------------------------------
Move the setting of demand_offline in sysfs interface, because there could be devices have not been attached to acpi_bus, If we set it in the probe phase, we might missing some pnp devices which is attached later.
Fixes: 6f2b4e587ed4 (soc: hisilicon: Don't poweroff if memblocks don't offlined) Signed-off-by: Zhang Zekun zhangzekun11@huawei.com --- drivers/soc/hisilicon/hisi_hbmdev.c | 43 +++++++++++++++++------------ 1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/drivers/soc/hisilicon/hisi_hbmdev.c b/drivers/soc/hisilicon/hisi_hbmdev.c index e64748a0a21e..e8c5b8a55b7c 100644 --- a/drivers/soc/hisilicon/hisi_hbmdev.c +++ b/drivers/soc/hisilicon/hisi_hbmdev.c @@ -73,11 +73,36 @@ static int memdev_power_on(struct acpi_device *adev) return 0; }
+static int hbmdev_check(struct acpi_device *adev, void *arg) +{ + const char *hid = acpi_device_hid(adev); + + if (!strcmp(hid, ACPI_MEMORY_DEVICE_HID)) { + if (arg) { + bool *found = arg; + *found = true; + return -1; + } + + /* There might be devices have not attached */ + if (!adev->handler) + return 0; + + acpi_scan_lock_acquire(); + adev->handler->hotplug.demand_offline = true; + acpi_scan_lock_release(); + } + + return 0; +} + static int memdev_power_off(struct acpi_device *adev) { acpi_handle handle = adev->handle; acpi_status status;
+ acpi_dev_for_each_child(adev, hbmdev_check, NULL); + status = acpi_evaluate_object(handle, "_OFF", NULL, NULL); if (ACPI_FAILURE(status)) { return -ENODEV; @@ -110,21 +135,6 @@ static ssize_t state_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_WO(state);
-static int hbmdev_setup(struct acpi_device *adev, void *arg) -{ - const char *hid = acpi_device_hid(adev); - bool *found = arg; - - if (!strcmp(hid, ACPI_MEMORY_DEVICE_HID)) { - acpi_scan_lock_acquire(); - adev->handler->hotplug.demand_offline = true; - acpi_scan_lock_release(); - *found = true; - } - - return 0; -} - static bool has_hbmdev(struct device *dev) { struct acpi_device *adev = ACPI_COMPANION(dev); @@ -134,8 +144,7 @@ static bool has_hbmdev(struct device *dev) if (strcmp(hid, ACPI_GENERIC_CONTAINER_DEVICE_HID)) return found;
- acpi_dev_for_each_child(adev, hbmdev_setup, &found); - + acpi_dev_for_each_child(adev, hbmdev_check, &found); return found; }