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

Merge branch 'acpica' 

Merge ACPICA updates for 5.16-rc1:

 - Fix system-wide resume issue caused by evaluating control methods
   too early in the resume path (Rafael Wysocki).

 - Add support for Windows 2020 _OSI string (Mario Limonciello).

 - Add Generic Port Affinity type for SRAT (Alison Schofield).

 - Add disassembly support for the NHLT ACPI table (Bob Moore).

* acpica:
  ACPICA: Update version to 20210930
  ACPICA: iASL table disassembler: Added disassembly support for the NHLT ACPI table
  ACPICA: ACPI 6.4 SRAT: add Generic Port Affinity type
  ACPICA: Add support for Windows 2020 _OSI string
  ACPICA: Avoid evaluating methods too early during system resume
parents d5a8fb65 93792be6

drivers/acpi/acpica/acglobal.h

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ extern struct acpi_bit_register_info 
    acpi_gbl_bit_register_info[ACPI_NUM_BITREG];

ACPI_GLOBAL(u8, acpi_gbl_sleep_type_a);

ACPI_GLOBAL(u8, acpi_gbl_sleep_type_b);

ACPI_GLOBAL(u8, acpi_gbl_sleep_type_a_s0);

ACPI_GLOBAL(u8, acpi_gbl_sleep_type_b_s0);



/*****************************************************************************

 *

drivers/acpi/acpica/hwesleep.c

+2 −6
Original line number Diff line number Diff line
@@ -147,17 +147,13 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state) 


acpi_status acpi_hw_extended_wake_prep(u8 sleep_state)

{

	acpi_status status;

	u8 sleep_type_value;



	ACPI_FUNCTION_TRACE(hw_extended_wake_prep);



	status = acpi_get_sleep_type_data(ACPI_STATE_S0,

					  &acpi_gbl_sleep_type_a,

					  &acpi_gbl_sleep_type_b);

	if (ACPI_SUCCESS(status)) {

	if (acpi_gbl_sleep_type_a_s0 != ACPI_SLEEP_TYPE_INVALID) {

		sleep_type_value =

		    ((acpi_gbl_sleep_type_a << ACPI_X_SLEEP_TYPE_POSITION) &

		    ((acpi_gbl_sleep_type_a_s0 << ACPI_X_SLEEP_TYPE_POSITION) &

		     ACPI_X_SLEEP_TYPE_MASK);



		(void)acpi_write((u64)(sleep_type_value | ACPI_X_SLEEP_ENABLE),

drivers/acpi/acpica/hwsleep.c

+4 −7
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state) 


acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state)

{

	acpi_status status;

	acpi_status status = AE_OK;

	struct acpi_bit_register_info *sleep_type_reg_info;

	struct acpi_bit_register_info *sleep_enable_reg_info;

	u32 pm1a_control;
@@ -192,10 +192,7 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state) 
	 * This is unclear from the ACPI Spec, but it is required

	 * by some machines.

	 */

	status = acpi_get_sleep_type_data(ACPI_STATE_S0,

					  &acpi_gbl_sleep_type_a,

					  &acpi_gbl_sleep_type_b);

	if (ACPI_SUCCESS(status)) {

	if (acpi_gbl_sleep_type_a_s0 != ACPI_SLEEP_TYPE_INVALID) {

		sleep_type_reg_info =

		    acpi_hw_get_bit_register_info(ACPI_BITREG_SLEEP_TYPE);

		sleep_enable_reg_info =
@@ -216,9 +213,9 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state) 


			/* Insert the SLP_TYP bits */



			pm1a_control |= (acpi_gbl_sleep_type_a <<

			pm1a_control |= (acpi_gbl_sleep_type_a_s0 <<

					 sleep_type_reg_info->bit_position);

			pm1b_control |= (acpi_gbl_sleep_type_b <<

			pm1b_control |= (acpi_gbl_sleep_type_b_s0 <<

					 sleep_type_reg_info->bit_position);



			/* Write the control registers and ignore any errors */

drivers/acpi/acpica/hwxfsleep.c

+7 −0
Original line number Diff line number Diff line
@@ -217,6 +217,13 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) 
		return_ACPI_STATUS(status);

	}



	status = acpi_get_sleep_type_data(ACPI_STATE_S0,

					  &acpi_gbl_sleep_type_a_s0,

					  &acpi_gbl_sleep_type_b_s0);

	if (ACPI_FAILURE(status)) {

		acpi_gbl_sleep_type_a_s0 = ACPI_SLEEP_TYPE_INVALID;

	}



	/* Execute the _PTS method (Prepare To Sleep) */



	arg_list.count = 1;

drivers/acpi/acpica/utosi.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { 
	{"Windows 2018", NULL, 0, ACPI_OSI_WIN_10_RS4},	/* Windows 10 version 1803 - Added 11/2018 */

	{"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5},	/* Windows 10 version 1809 - Added 11/2018 */

	{"Windows 2019", NULL, 0, ACPI_OSI_WIN_10_19H1},	/* Windows 10 version 1903 - Added 08/2019 */

	{"Windows 2020", NULL, 0, ACPI_OSI_WIN_10_20H1},	/* Windows 10 version 2004 - Added 08/2021 */



	/* Feature Group Strings */