PCI/ACPI: Guard ARM64-specific mcfg_quirks

[platform/kernel/linux-rpi.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index b9863e2..c95eedd 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -52,7 +52,6 @@ struct acpi_power_resource {
        u32 order;
        unsigned int ref_count;
        u8 state;
-       bool wakeup_enabled;
        struct mutex resource_lock;
        struct list_head dependents;
 };
@@ -615,20 +614,19 @@ int acpi_power_wakeup_list_init(struct list_head *list, int *system_level_p)
 
        list_for_each_entry(entry, list, node) {
                struct acpi_power_resource *resource = entry->resource;
-               int result;
                u8 state;
 
                mutex_lock(&resource->resource_lock);
 
-               result = acpi_power_get_state(resource, &state);
-               if (result) {
-                       mutex_unlock(&resource->resource_lock);
-                       return result;
-               }
-               if (state == ACPI_POWER_RESOURCE_STATE_ON) {
-                       resource->ref_count++;
-                       resource->wakeup_enabled = true;
-               }
+               /*
+                * Make sure that the power resource state and its reference
+                * counter value are consistent with each other.
+                */
+               if (!resource->ref_count &&
+                   !acpi_power_get_state(resource, &state) &&
+                   state == ACPI_POWER_RESOURCE_STATE_ON)
+                       __acpi_power_off(resource);
+
                if (system_level > resource->system_level)
                        system_level = resource->system_level;
 
@@ -711,7 +709,6 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
  */
 int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state)
 {
-       struct acpi_power_resource_entry *entry;
        int err = 0;
 
        if (!dev || !dev->wakeup.flags.valid)
@@ -722,26 +719,13 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state)
        if (dev->wakeup.prepare_count++)
                goto out;
 
-       list_for_each_entry(entry, &dev->wakeup.resources, node) {
-               struct acpi_power_resource *resource = entry->resource;
-
-               mutex_lock(&resource->resource_lock);
-
-               if (!resource->wakeup_enabled) {
-                       err = acpi_power_on_unlocked(resource);
-                       if (!err)
-                               resource->wakeup_enabled = true;
-               }
-
-               mutex_unlock(&resource->resource_lock);
-
-               if (err) {
-                       dev_err(&dev->dev,
-                               "Cannot turn wakeup power resources on\n");
-                       dev->wakeup.flags.valid = 0;
-                       goto out;
-               }
+       err = acpi_power_on_list(&dev->wakeup.resources);
+       if (err) {
+               dev_err(&dev->dev, "Cannot turn on wakeup power resources\n");
+               dev->wakeup.flags.valid = 0;
+               goto out;
        }
+
        /*
         * Passing 3 as the third argument below means the device may be
         * put into arbitrary power state afterward.
@@ -771,39 +755,31 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
 
        mutex_lock(&acpi_device_lock);
 
-       if (--dev->wakeup.prepare_count > 0)
+       /* Do nothing if wakeup power has not been enabled for this device. */
+       if (dev->wakeup.prepare_count <= 0)
                goto out;
 
-       /*
-        * Executing the code below even if prepare_count is already zero when
-        * the function is called may be useful, for example for initialisation.
-        */
-       if (dev->wakeup.prepare_count < 0)
-               dev->wakeup.prepare_count = 0;
+       if (--dev->wakeup.prepare_count > 0)
+               goto out;
 
        err = acpi_device_sleep_wake(dev, 0, 0, 0);
        if (err)
                goto out;
 
+       /*
+        * All of the power resources in the list need to be turned off even if
+        * there are errors.
+        */
        list_for_each_entry(entry, &dev->wakeup.resources, node) {
-               struct acpi_power_resource *resource = entry->resource;
-
-               mutex_lock(&resource->resource_lock);
-
-               if (resource->wakeup_enabled) {
-                       err = acpi_power_off_unlocked(resource);
-                       if (!err)
-                               resource->wakeup_enabled = false;
-               }
-
-               mutex_unlock(&resource->resource_lock);
+               int ret;
 
-               if (err) {
-                       dev_err(&dev->dev,
-                               "Cannot turn wakeup power resources off\n");
-                       dev->wakeup.flags.valid = 0;
-                       break;
-               }
+               ret = acpi_power_off(entry->resource);
+               if (ret && !err)
+                       err = ret;
+       }
+       if (err) {
+               dev_err(&dev->dev, "Cannot turn off wakeup power resources\n");
+               dev->wakeup.flags.valid = 0;
        }
 
  out:
@@ -1035,13 +1011,8 @@ void acpi_turn_off_unused_power_resources(void)
        list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {
                mutex_lock(&resource->resource_lock);
 
-               /*
-                * Turn off power resources in an unknown state too, because the
-                * platform firmware on some system expects the OS to turn off
-                * power resources without any users unconditionally.
-                */
                if (!resource->ref_count &&
-                   resource->state != ACPI_POWER_RESOURCE_STATE_OFF) {
+                   resource->state == ACPI_POWER_RESOURCE_STATE_ON) {
                        acpi_handle_debug(resource->device.handle, "Turning OFF\n");
                        __acpi_power_off(resource);
                }