Commit d326f44e authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'tboot' into release 



Conflicts:
	drivers/acpi/acpica/hwsleep.c

Text conflict between:

2feec47d
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)

which removed #include "actables.h"

and

09f98a82
(x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.)

which removed #include <linux/tboot.h>

The resolution is to remove them both.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents ec612fcf e840dfe3

arch/x86/kernel/tboot.c

+6 −3
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void tboot_copy_fadt(const struct acpi_table_fadt *fadt) 
		offsetof(struct acpi_table_facs, firmware_waking_vector);

}



void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)

static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)

{

	static u32 acpi_shutdown_map[ACPI_S_STATE_COUNT] = {

		/* S0,1,2: */ -1, -1, -1,
@@ -281,7 +281,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) 
		/* S5: */ TB_SHUTDOWN_S5 };



	if (!tboot_enabled())

		return;

		return 0;



	tboot_copy_fadt(&acpi_gbl_FADT);

	tboot->acpi_sinfo.pm1a_cnt_val = pm1a_control;
@@ -292,10 +292,11 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) 
	if (sleep_state >= ACPI_S_STATE_COUNT ||

	    acpi_shutdown_map[sleep_state] == -1) {

		pr_warning("unsupported sleep state 0x%x\n", sleep_state);

		return;

		return -1;

	}



	tboot_shutdown(acpi_shutdown_map[sleep_state]);

	return 0;

}



static atomic_t ap_wfs_count;
@@ -345,6 +346,8 @@ static __init int tboot_late_init(void) 


	atomic_set(&ap_wfs_count, 0);

	register_hotcpu_notifier(&tboot_cpu_notifier);



	acpi_os_set_prepare_sleep(&tboot_sleep);

	return 0;

}

drivers/acpi/acpica/hwsleep.c

+7 −3
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 
 */



#include <acpi/acpi.h>

#include <linux/acpi.h>

#include "accommon.h"

#include <linux/tboot.h>

#include <linux/module.h>



#define _COMPONENT          ACPI_HARDWARE
@@ -172,8 +172,12 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state, u8 flags) 


	ACPI_FLUSH_CPU_CACHE();



	tboot_sleep(sleep_state, pm1a_control, pm1b_control);



	status = acpi_os_prepare_sleep(sleep_state, pm1a_control,

				       pm1b_control);

	if (ACPI_SKIP(status))

		return_ACPI_STATUS(AE_OK);

	if (ACPI_FAILURE(status))

		return_ACPI_STATUS(status);

	/* Write #2: Write both SLP_TYP + SLP_EN */



	status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control);

drivers/acpi/osl.c

+24 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ EXPORT_SYMBOL(acpi_in_debugger); 
extern char line_buf[80];

#endif				/*ENABLE_DEBUGGER */



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

				      u32 pm1b_ctrl);



static acpi_osd_handler acpi_irq_handler;

static void *acpi_irq_context;

static struct workqueue_struct *kacpid_wq;
@@ -1569,3 +1572,24 @@ acpi_status acpi_os_terminate(void) 


	return AE_OK;

}



acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control,

				  u32 pm1b_control)

{

	int rc = 0;

	if (__acpi_os_prepare_sleep)

		rc = __acpi_os_prepare_sleep(sleep_state,

					     pm1a_control, pm1b_control);

	if (rc < 0)

		return AE_ERROR;

	else if (rc > 0)

		return AE_CTRL_SKIP;



	return AE_OK;

}



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

			       u32 pm1a_ctrl, u32 pm1b_ctrl))

{

	__acpi_os_prepare_sleep = func;

}

include/acpi/acexcep.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define ACPI_SUCCESS(a)                 (!(a))

#define ACPI_FAILURE(a)                 (a)



#define ACPI_SKIP(a)                    (a == AE_CTRL_SKIP)

#define AE_OK                           (acpi_status) 0x0000



/*

include/linux/acpi.h

+10 −0
Original line number Diff line number Diff line
@@ -371,4 +371,14 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), 


#endif	/* !CONFIG_ACPI */



#ifdef CONFIG_ACPI

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

			       u32 pm1a_ctrl,  u32 pm1b_ctrl));



acpi_status acpi_os_prepare_sleep(u8 sleep_state,

				  u32 pm1a_control, u32 pm1b_control);

#else

#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0)

#endif



#endif	/*_LINUX_ACPI_H*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE