Commit 811d59fd authored by Mario Limonciello's avatar Mario Limonciello Committed by Hans de Goede
Browse files

ACPI: s2idle: Add a new ->check() callback for platform_s2idle_ops 



On some platforms it is found that Linux more aggressively enters s2idle
than Windows enters Modern Standby and this uncovers some synchronization
issues for the platform.  To aid in debugging this class of problems in
the future, add support for an extra optional callback intended for
drivers to emit extra debugging.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20220829162953.5947-2-mario.limonciello@amd.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 76fba122

drivers/acpi/sleep.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ static inline acpi_status acpi_set_waking_vector(u32 wakeup_address) 
extern int acpi_s2idle_begin(void);

extern int acpi_s2idle_prepare(void);

extern int acpi_s2idle_prepare_late(void);

extern void acpi_s2idle_check(void);

extern bool acpi_s2idle_wake(void);

extern void acpi_s2idle_restore_early(void);

extern void acpi_s2idle_restore(void);

drivers/acpi/x86/s2idle.c

+14 −0
Original line number Diff line number Diff line
@@ -486,6 +486,19 @@ int acpi_s2idle_prepare_late(void) 
	return 0;

}



void acpi_s2idle_check(void)

{

	struct acpi_s2idle_dev_ops *handler;



	if (!lps0_device_handle || sleep_no_lps0)

		return;



	list_for_each_entry(handler, &lps0_s2idle_devops_head, list_node) {

		if (handler->check)

			handler->check();

	}

}



void acpi_s2idle_restore_early(void)

{

	struct acpi_s2idle_dev_ops *handler;
@@ -527,6 +540,7 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = { 
	.begin = acpi_s2idle_begin,

	.prepare = acpi_s2idle_prepare,

	.prepare_late = acpi_s2idle_prepare_late,

	.check = acpi_s2idle_check,

	.wake = acpi_s2idle_wake,

	.restore_early = acpi_s2idle_restore_early,

	.restore = acpi_s2idle_restore,

include/linux/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,7 @@ acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, 
struct acpi_s2idle_dev_ops {

	struct list_head list_node;

	void (*prepare)(void);

	void (*check)(void);

	void (*restore)(void);

};

int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg);

include/linux/suspend.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ struct platform_s2idle_ops { 
	int (*begin)(void);

	int (*prepare)(void);

	int (*prepare_late)(void);

	void (*check)(void);

	bool (*wake)(void);

	void (*restore_early)(void);

	void (*restore)(void);

kernel/power/suspend.c

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ static void s2idle_loop(void) 
			break;

		}



		if (s2idle_ops && s2idle_ops->check)

			s2idle_ops->check();



		s2idle_enter();

	}