Commit cb1cb178 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

ACPI / PM: Do not enable GPEs for system wakeup in advance 

After commit 9630bdd9
(ACPI: Use GPE reference counting to support shared GPEs) the wakeup
enable mask bits of GPEs are set as soon as the GPEs are enabled to
wake up the system.  Unfortunately, this leads to a regression
reported by Michal Hocko, where a system is woken up from ACPI S5 by
a device that is not supposed to do that, because the wakeup enable
mask bit of this device's GPE is always set when
acpi_enter_sleep_state() calls acpi_hw_enable_all_wakeup_gpes(),
although it should only be set if the device is supposed to wake up
the system from the target state.

To work around this issue, rework the ACPI power management code so
that GPEs are not enabled to wake up the system upfront, but only
during a system state transition when the target state of the system
is known.  [Of course, this means that the reference counting of
"wakeup" GPEs doesn't really make sense and it is sufficient to
set/unset the wakeup mask bits for them during system sleep
transitions.  This will allow us to simplify the GPE handling code
quite a bit, but that change is too intrusive for 2.6.35.]

Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15951



Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reported-and-tested-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 7e27d6e7

drivers/acpi/button.c

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int acpi_button_add(struct acpi_device *device) 
		/* Button's GPE is run-wake GPE */

		acpi_enable_gpe(device->wakeup.gpe_device,

				device->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE_RUN);

				ACPI_GPE_TYPE_RUNTIME);

		device->wakeup.run_wake_count++;

		device->wakeup.state.enabled = 1;

	}
@@ -449,7 +449,7 @@ static int acpi_button_remove(struct acpi_device *device, int type) 
	if (device->wakeup.flags.valid) {

		acpi_disable_gpe(device->wakeup.gpe_device,

				device->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE_RUN);

				ACPI_GPE_TYPE_RUNTIME);

		device->wakeup.run_wake_count--;

		device->wakeup.state.enabled = 0;

	}

drivers/acpi/wakeup.c

+7 −13
Original line number Diff line number Diff line
@@ -64,16 +64,13 @@ void acpi_enable_wakeup_device(u8 sleep_state) 
		struct acpi_device *dev =

			container_of(node, struct acpi_device, wakeup_list);



		if (!dev->wakeup.flags.valid)

			continue;



		if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)

		if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled

		    || sleep_state > (u32) dev->wakeup.sleep_state)

			continue;



		/* The wake-up power should have been enabled already. */

		acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_ENABLE);

		acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE);

	}

}
@@ -96,6 +93,8 @@ void acpi_disable_wakeup_device(u8 sleep_state) 
		    || (sleep_state > (u32) dev->wakeup.sleep_state))

			continue;



		acpi_disable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

				ACPI_GPE_TYPE_WAKE);

		acpi_disable_wakeup_device_power(dev);

	}

}
@@ -109,12 +108,7 @@ int __init acpi_wakeup_device_init(void) 
		struct acpi_device *dev = container_of(node,

						       struct acpi_device,

						       wakeup_list);

		/* In case user doesn't load button driver */

		if (!dev->wakeup.flags.always_enabled ||

		    dev->wakeup.state.enabled)

			continue;

 		acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,

 				ACPI_GPE_TYPE_WAKE);

		if (dev->wakeup.flags.always_enabled)

			dev->wakeup.state.enabled = 1;

	}

	mutex_unlock(&acpi_device_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE