Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branches 'acpi-soc' and 'acpi-processor' 

These are a stable-candidate suspend/resume fix of the ACPI driver for
Intel SoCs (LPSS) and an inline stub fix for the ACPI processor driver.

* acpi-soc:
  ACPI / LPSS: Avoid PM quirks on suspend and resume from S3

* acpi-processor:
  ACPI / processor: Finish making acpi_processor_ppc_has_changed() void
parents 8195a655 a09c5913 a507a306

drivers/acpi/acpi_lpss.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/pm_domain.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/pwm.h>

#include <linux/pwm.h>

#include <linux/suspend.h>

#include <linux/delay.h>

#include <linux/delay.h>





#include "internal.h"

#include "internal.h"
@@ -946,9 +947,10 @@ static void lpss_iosf_exit_d3_state(void) 
	mutex_unlock(&lpss_iosf_mutex);

	mutex_unlock(&lpss_iosf_mutex);

}

}





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

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

{

{

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

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

	bool wakeup = runtime || device_may_wakeup(dev);

	int ret;

	int ret;





	if (pdata->dev_desc->flags & LPSS_SAVE_CTX)

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

	 * wrong status for devices being about to be powered off. See

	 * lpss_iosf_enter_d3_state() for further information.

	 * lpss_iosf_enter_d3_state() for further information.

	 */

	 */

	if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

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

	    lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

		lpss_iosf_enter_d3_state();

		lpss_iosf_enter_d3_state();





	return ret;

	return ret;

}

}





static int acpi_lpss_resume(struct device *dev)

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

{

{

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

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

	int ret;

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

	 * This call is kept first to be in symmetry with

	 * acpi_lpss_runtime_suspend() one.

	 * acpi_lpss_runtime_suspend() one.

	 */

	 */

	if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

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

	    lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())

		lpss_iosf_exit_d3_state();

		lpss_iosf_exit_d3_state();





	ret = acpi_dev_resume(dev);

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

		return 0;





	ret = pm_generic_suspend_late(dev);

	ret = pm_generic_suspend_late(dev);

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

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

}

}





static int acpi_lpss_resume_early(struct device *dev)

static int acpi_lpss_resume_early(struct device *dev)

{

{

	int ret = acpi_lpss_resume(dev);

	int ret = acpi_lpss_resume(dev, false);





	return ret ? ret : pm_generic_resume_early(dev);

	return ret ? ret : pm_generic_resume_early(dev);

}

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




static int acpi_lpss_runtime_resume(struct device *dev)

static int acpi_lpss_runtime_resume(struct device *dev)

{

{

	int ret = acpi_lpss_resume(dev);

	int ret = acpi_lpss_resume(dev, true);





	return ret ? ret : pm_generic_runtime_resume(dev);

	return ret ? ret : pm_generic_runtime_resume(dev);

}

}

include/acpi/processor.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -309,7 +309,7 @@ static inline void acpi_processor_ppc_exit(void) 
{

{

	return;

	return;

}

}

static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr,

static inline void acpi_processor_ppc_has_changed(struct acpi_processor *pr,

								int event_flag)

								int event_flag)

{

{

	static unsigned int printout = 1;

	static unsigned int printout = 1;
@@ -320,7 +320,6 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr, 
		       "Consider compiling CPUfreq support into your kernel.\n");

		       "Consider compiling CPUfreq support into your kernel.\n");

		printout = 0;

		printout = 0;

	}

	}

	return 0;

}

}

static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)

static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)

{

{