Commit eed4d47e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle 



The ACPI SCI (System Control Interrupt) is set up as a wakeup IRQ
during suspend-to-idle transitions and, consequently, any events
signaled through it wake up the system from that state.  However,
on some systems some of the events signaled via the ACPI SCI while
suspended to idle should not cause the system to wake up.  In fact,
quite often they should just be discarded.

Arguably, systems should not resume entirely on such events, but in
order to decide which events really should cause the system to resume
and which are spurious, it is necessary to resume up to the point
when ACPI SCIs are actually handled and processed, which is after
executing dpm_resume_noirq() in the system resume path.

For this reasons, add a loop around freeze_enter() in which the
platforms can process events signaled via multiplexed IRQ lines
like the ACPI SCI and add suspend-to-idle hooks that can be
used for this purpose to struct platform_freeze_ops.

In the ACPI case, the ->wake hook is used for checking if the SCI
has triggered while suspended and deferring the interrupt-induced
system wakeup until the events signaled through it are actually
processed sufficiently to decide whether or not the system should
resume.  In turn, the ->sync hook allows all of the relevant event
queues to be flushed so as to prevent events from being missed due
to race conditions.

In addition to that, some ACPI code processing wakeup events needs
to be modified to use the "hard" version of wakeup triggers, so that
it will cause a system resume to happen on device-induced wakeup
events even if the "soft" mechanism to prevent the system from
suspending is not enabled (that also helps to catch device-induced
wakeup events occurring during suspend transitions in progress).

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8a537ece

drivers/acpi/battery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -776,7 +776,7 @@ static int acpi_battery_update(struct acpi_battery *battery, bool resume) 
	if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||

	if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||

	    (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&

	    (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&

            (battery->capacity_now <= battery->alarm)))

            (battery->capacity_now <= battery->alarm)))

		pm_wakeup_event(&battery->device->dev, 0);

		pm_wakeup_hard_event(&battery->device->dev);





	return result;

	return result;

}

}

drivers/acpi/button.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) 
	}

	}





	if (state)

	if (state)

		pm_wakeup_event(&device->dev, 0);

		pm_wakeup_hard_event(&device->dev);





	ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);

	ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);

	if (ret == NOTIFY_DONE)

	if (ret == NOTIFY_DONE)
@@ -398,7 +398,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
		} else {

		} else {

			int keycode;

			int keycode;





			pm_wakeup_event(&device->dev, 0);

			pm_wakeup_hard_event(&device->dev);

			if (button->suspended)

			if (button->suspended)

				break;

				break;
@@ -530,6 +530,7 @@ static int acpi_button_add(struct acpi_device *device) 
		lid_device = device;

		lid_device = device;

	}

	}





	device_init_wakeup(&device->dev, true);

	printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));

	printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));

	return 0;

	return 0;

drivers/acpi/device_pm.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/pm_qos.h>

#include <linux/pm_qos.h>

#include <linux/pm_domain.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/suspend.h>





#include "internal.h"

#include "internal.h"
@@ -399,7 +400,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) 
	mutex_lock(&acpi_pm_notifier_lock);

	mutex_lock(&acpi_pm_notifier_lock);





	if (adev->wakeup.flags.notifier_present) {

	if (adev->wakeup.flags.notifier_present) {

		__pm_wakeup_event(adev->wakeup.ws, 0);

		pm_wakeup_ws_event(adev->wakeup.ws, 0, true);

		if (adev->wakeup.context.work.func)

		if (adev->wakeup.context.work.func)

			queue_pm_work(&adev->wakeup.context.work);

			queue_pm_work(&adev->wakeup.context.work);

	}

	}

drivers/acpi/sleep.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -662,14 +662,40 @@ static int acpi_freeze_prepare(void) 
	acpi_os_wait_events_complete();

	acpi_os_wait_events_complete();

	if (acpi_sci_irq_valid())

	if (acpi_sci_irq_valid())

		enable_irq_wake(acpi_sci_irq);

		enable_irq_wake(acpi_sci_irq);



	return 0;

	return 0;

}

}





static void acpi_freeze_wake(void)

{

	/*

	 * If IRQD_WAKEUP_ARMED is not set for the SCI at this point, it means

	 * that the SCI has triggered while suspended, so cancel the wakeup in

	 * case it has not been a wakeup event (the GPEs will be checked later).

	 */

	if (acpi_sci_irq_valid() &&

	    !irqd_is_wakeup_armed(irq_get_irq_data(acpi_sci_irq)))

		pm_system_cancel_wakeup();

}



static void acpi_freeze_sync(void)

{

	/*

	 * Process all pending events in case there are any wakeup ones.

	 *

	 * The EC driver uses the system workqueue, so that one needs to be

	 * flushed too.

	 */

	acpi_os_wait_events_complete();

	flush_scheduled_work();

}



static void acpi_freeze_restore(void)

static void acpi_freeze_restore(void)

{

{

	acpi_disable_wakeup_devices(ACPI_STATE_S0);

	acpi_disable_wakeup_devices(ACPI_STATE_S0);

	if (acpi_sci_irq_valid())

	if (acpi_sci_irq_valid())

		disable_irq_wake(acpi_sci_irq);

		disable_irq_wake(acpi_sci_irq);



	acpi_enable_all_runtime_gpes();

	acpi_enable_all_runtime_gpes();

}

}
@@ -681,6 +707,8 @@ static void acpi_freeze_end(void) 
static const struct platform_freeze_ops acpi_freeze_ops = {

static const struct platform_freeze_ops acpi_freeze_ops = {

	.begin = acpi_freeze_begin,

	.begin = acpi_freeze_begin,

	.prepare = acpi_freeze_prepare,

	.prepare = acpi_freeze_prepare,

	.wake = acpi_freeze_wake,

	.sync = acpi_freeze_sync,

	.restore = acpi_freeze_restore,

	.restore = acpi_freeze_restore,

	.end = acpi_freeze_end,

	.end = acpi_freeze_end,

};

};

drivers/base/power/main.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1091,11 +1091,6 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a 
	if (async_error)

	if (async_error)

		goto Complete;

		goto Complete;





	if (pm_wakeup_pending()) {

		async_error = -EBUSY;

		goto Complete;

	}



	if (dev->power.syscore || dev->power.direct_complete)

	if (dev->power.syscore || dev->power.direct_complete)

		goto Complete;

		goto Complete;

CRA Git | Maintained and supported by SUSTech CRA and CCSE