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

Commit d6b47b12 authored by Ben Guthro's avatar Ben Guthro Committed by Rafael J. Wysocki
Browse files

ACPI / sleep: Introduce acpi_os_prepare_extended_sleep() for extended sleep path 



Like acpi_os_prepare_sleep(), register a callback for use in systems
like tboot, and xen, which have system specific requirements outside
of ACPICA.  This mirrors the functionality in acpi_os_prepare_sleep(),
called from acpi_hw_sleep()

Signed-off-by: default avatarBen Guthro <benjamin.guthro@citrix.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5ae90d8e

drivers/acpi/acpica/hwesleep.c

+9 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
 */



#include <acpi/acpi.h>

#include <linux/acpi.h>

#include "accommon.h"



#define _COMPONENT          ACPI_HARDWARE
@@ -128,6 +129,14 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state) 


	ACPI_FLUSH_CPU_CACHE();



	status = acpi_os_prepare_extended_sleep(sleep_state,

						acpi_gbl_sleep_type_a,

						acpi_gbl_sleep_type_b);

	if (ACPI_SKIP(status))

		return_ACPI_STATUS(AE_OK);

	if (ACPI_FAILURE(status))

		return_ACPI_STATUS(status);



	/*

	 * Set the SLP_TYP and SLP_EN bits.

	 *

drivers/acpi/osl.c

+24 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ extern char line_buf[80]; 


static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 pm1a_ctrl,

				      u32 pm1b_ctrl);

static int (*__acpi_os_prepare_extended_sleep)(u8 sleep_state, u32 val_a,

				      u32 val_b);



static acpi_osd_handler acpi_irq_handler;

static void *acpi_irq_context;
@@ -1779,6 +1781,28 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, 
	__acpi_os_prepare_sleep = func;

}



acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a,

				  u32 val_b)

{

	int rc = 0;

	if (__acpi_os_prepare_extended_sleep)

		rc = __acpi_os_prepare_extended_sleep(sleep_state,

					     val_a, val_b);

	if (rc < 0)

		return AE_ERROR;

	else if (rc > 0)

		return AE_CTRL_SKIP;



	return AE_OK;

}



void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,

			       u32 val_a, u32 val_b))

{

	__acpi_os_prepare_extended_sleep = func;

}





void alloc_acpi_hp_work(acpi_handle handle, u32 type, void *context,

			void (*func)(struct work_struct *work))

{

include/linux/acpi.h

+7 −0
Original line number Diff line number Diff line
@@ -481,6 +481,13 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, 


acpi_status acpi_os_prepare_sleep(u8 sleep_state,

				  u32 pm1a_control, u32 pm1b_control);



void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,

				        u32 val_a,  u32 val_b));



acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state,

					   u32 val_a, u32 val_b);



#ifdef CONFIG_X86

void arch_reserve_mem_area(acpi_physical_address addr, size_t size);

#else