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

Merge branch 'acpi-pm' 

* acpi-pm:
  ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
  PM / sleep: Rename platform suspend/resume functions in suspend.c
  PM / sleep: Export dpm_suspend_late/noirq() and dpm_resume_early/noirq()
parents 0ede4700 a8d46b9e

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, 


	acpi_irq_handler = handler;

	acpi_irq_context = context;

	if (request_irq(irq, acpi_irq, IRQF_SHARED | IRQF_NO_SUSPEND, "acpi", acpi_irq)) {

	if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {

		printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);

		acpi_irq_handler = NULL;

		return AE_NOT_ACQUIRED;

drivers/acpi/sleep.c

+16 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/irq.h>

#include <linux/dmi.h>

#include <linux/device.h>

#include <linux/interrupt.h>

#include <linux/suspend.h>

#include <linux/reboot.h>

#include <linux/acpi.h>
@@ -626,6 +627,19 @@ static int acpi_freeze_begin(void) 
	return 0;

}



static int acpi_freeze_prepare(void)

{

	acpi_enable_all_wakeup_gpes();

	enable_irq_wake(acpi_gbl_FADT.sci_interrupt);

	return 0;

}



static void acpi_freeze_restore(void)

{

	disable_irq_wake(acpi_gbl_FADT.sci_interrupt);

	acpi_enable_all_runtime_gpes();

}



static void acpi_freeze_end(void)

{

	acpi_scan_lock_release();
@@ -633,6 +647,8 @@ static void acpi_freeze_end(void) 


static const struct platform_freeze_ops acpi_freeze_ops = {

	.begin = acpi_freeze_begin,

	.prepare = acpi_freeze_prepare,

	.restore = acpi_freeze_restore,

	.end = acpi_freeze_end,

};

drivers/base/power/main.c

+4 −4
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static void async_resume_noirq(void *data, async_cookie_t cookie) 
 * Call the "noirq" resume handlers for all devices in dpm_noirq_list and

 * enable device drivers to receive interrupts.

 */

static void dpm_resume_noirq(pm_message_t state)

void dpm_resume_noirq(pm_message_t state)

{

	struct device *dev;

	ktime_t starttime = ktime_get();
@@ -662,7 +662,7 @@ static void async_resume_early(void *data, async_cookie_t cookie) 
 * dpm_resume_early - Execute "early resume" callbacks for all devices.

 * @state: PM transition of the system being carried out.

 */

static void dpm_resume_early(pm_message_t state)

void dpm_resume_early(pm_message_t state)

{

	struct device *dev;

	ktime_t starttime = ktime_get();
@@ -1093,7 +1093,7 @@ static int device_suspend_noirq(struct device *dev) 
 * Prevent device drivers from receiving interrupts and call the "noirq" suspend

 * handlers for all non-sysdev devices.

 */

static int dpm_suspend_noirq(pm_message_t state)

int dpm_suspend_noirq(pm_message_t state)

{

	ktime_t starttime = ktime_get();

	int error = 0;
@@ -1232,7 +1232,7 @@ static int device_suspend_late(struct device *dev) 
 * dpm_suspend_late - Execute "late suspend" callbacks for all devices.

 * @state: PM transition of the system being carried out.

 */

static int dpm_suspend_late(pm_message_t state)

int dpm_suspend_late(pm_message_t state)

{

	ktime_t starttime = ktime_get();

	int error = 0;

include/linux/pm.h

+4 −0
Original line number Diff line number Diff line
@@ -679,12 +679,16 @@ struct dev_pm_domain { 
extern void device_pm_lock(void);

extern void dpm_resume_start(pm_message_t state);

extern void dpm_resume_end(pm_message_t state);

extern void dpm_resume_noirq(pm_message_t state);

extern void dpm_resume_early(pm_message_t state);

extern void dpm_resume(pm_message_t state);

extern void dpm_complete(pm_message_t state);



extern void device_pm_unlock(void);

extern int dpm_suspend_end(pm_message_t state);

extern int dpm_suspend_start(pm_message_t state);

extern int dpm_suspend_noirq(pm_message_t state);

extern int dpm_suspend_late(pm_message_t state);

extern int dpm_suspend(pm_message_t state);

extern int dpm_prepare(pm_message_t state);

include/linux/suspend.h

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ struct platform_suspend_ops { 


struct platform_freeze_ops {

	int (*begin)(void);

	int (*prepare)(void);

	void (*restore)(void);

	void (*end)(void);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE