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

Merge branch 'acpi-soc' 

Merge a fix for hibernation regression in the ACPI driver for Intel
SoCs (LPSS).

* acpi-soc:
  ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation
parents 460a5310 12864ff8

drivers/acpi/acpi_lpss.c

+17 −9
Original line number Diff line number Diff line
@@ -879,6 +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 void lpss_iosf_enter_d3_state(void)

{
@@ -921,6 +922,9 @@ static void lpss_iosf_enter_d3_state(void) 


	iosf_mbi_modify(LPSS_IOSF_UNIT_LPIOEP, MBI_CR_WRITE,

			LPSS_IOSF_GPIODEF0, value1, mask1);



	lpss_iosf_d3_entered = true;



exit:

	mutex_unlock(&lpss_iosf_mutex);

}
@@ -935,6 +939,11 @@ static void lpss_iosf_exit_d3_state(void) 


	mutex_lock(&lpss_iosf_mutex);



	if (!lpss_iosf_d3_entered)

		goto exit;



	lpss_iosf_d3_entered = false;



	iosf_mbi_modify(LPSS_IOSF_UNIT_LPIOEP, MBI_CR_WRITE,

			LPSS_IOSF_GPIODEF0, value1, mask1);
@@ -944,13 +953,13 @@ static void lpss_iosf_exit_d3_state(void) 
	iosf_mbi_modify(LPSS_IOSF_UNIT_LPIO1, MBI_CFG_WRITE,

			LPSS_IOSF_PMCSR, value2, mask2);



exit:

	mutex_unlock(&lpss_iosf_mutex);

}



static int acpi_lpss_suspend(struct device *dev, bool runtime)

static int acpi_lpss_suspend(struct device *dev, bool wakeup)

{

	struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));

	bool wakeup = runtime || device_may_wakeup(dev);

	int ret;



	if (pdata->dev_desc->flags & LPSS_SAVE_CTX)
@@ -963,14 +972,14 @@ static int acpi_lpss_suspend(struct device *dev, bool runtime) 
	 * wrong status for devices being about to be powered off. See

	 * lpss_iosf_enter_d3_state() for further information.

	 */

	if ((runtime || !pm_suspend_via_firmware()) &&

	if (acpi_target_system_state() == ACPI_STATE_S0 &&

	    lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

		lpss_iosf_enter_d3_state();



	return ret;

}



static int acpi_lpss_resume(struct device *dev, bool runtime)

static int acpi_lpss_resume(struct device *dev)

{

	struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));

	int ret;
@@ -979,8 +988,7 @@ static int acpi_lpss_resume(struct device *dev, bool runtime) 
	 * This call is kept first to be in symmetry with

	 * acpi_lpss_runtime_suspend() one.

	 */

	if ((runtime || !pm_resume_via_firmware()) &&

	    lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

	if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

		lpss_iosf_exit_d3_state();



	ret = acpi_dev_resume(dev);
@@ -1004,12 +1012,12 @@ static int acpi_lpss_suspend_late(struct device *dev) 
		return 0;



	ret = pm_generic_suspend_late(dev);

	return ret ? ret : acpi_lpss_suspend(dev, false);

	return ret ? ret : acpi_lpss_suspend(dev, device_may_wakeup(dev));

}



static int acpi_lpss_resume_early(struct device *dev)

{

	int ret = acpi_lpss_resume(dev, false);

	int ret = acpi_lpss_resume(dev);



	return ret ? ret : pm_generic_resume_early(dev);

}
@@ -1024,7 +1032,7 @@ static int acpi_lpss_runtime_suspend(struct device *dev) 


static int acpi_lpss_runtime_resume(struct device *dev)

{

	int ret = acpi_lpss_resume(dev, true);

	int ret = acpi_lpss_resume(dev);



	return ret ? ret : pm_generic_runtime_resume(dev);

}