Commit f11fc4bc authored Sep 03, 2018 by Zhang Rui Committed by Rafael J. Wysocki Sep 06, 2018

ACPI / LPSS: Force LPSS quirks on boot

Commit 12864ff8 (ACPI / LPSS: Avoid PM quirks on suspend and resume
from hibernation) bypasses lpss quirks for S3 and S4, by setting a flag
for S3/S4 in acpi_lpss_suspend(), and check that flag in
acpi_lpss_resume().

But this overlooks the boot case where acpi_lpss_resume() may get called
without a corresponding acpi_lpss_suspend() having been called.

Thus force setting the flag during boot.

Fixes: 12864ff8 (ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation)
Link: https://bugzilla.kernel.org/show_bug.cgi?id=200989


Reported-and-tested-by: William Lieurance <william.lieurance@namikoda.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Cc: 4.15+ <stable@vger.kernel.org> # 4.15+: 12864ff8 (ACPI / LPSS: Avoid ...)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 57361846

drivers/acpi/acpi_lpss.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -879,7 +879,7 @@ static void acpi_lpss_dismiss(struct device *dev)
		#define LPSS_GPIODEF0_DMA_LLP BIT(13)

		static DEFINE_MUTEX(lpss_iosf_mutex);
		static bool lpss_iosf_d3_entered;
		static bool lpss_iosf_d3_entered = true;

		static void lpss_iosf_enter_d3_state(void)
		{

Admin message