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

Merge branches 'acpica' and 'acpi-tables' 

* acpica:
  ACPICA: Update version to 20200430
  ACPICA: Fix required parameters for _NIG and _NIH
  ACPICA: Dispatcher: add status checks
  ACPICA: Disassembler: ignore AE_ALREADY_EXISTS status when parsing create operators
  ACPICA: Move acpi_gbl_next_cmd_num definition to acglobal.h
  ACPICA: Make acpi_protocol_lengths static

* acpi-tables:
  ACPI: sleep: Put the FACS table after using it
  ACPI: scan: Put SPCR and STAO table after using it
  ACPI: EC: Put the ACPI table after using it
  ACPI: APEI: Put the HEST table for error path
  ACPI: APEI: Put the error record serialization table for error path
  ACPI: APEI: Put the error injection table for error path and module exit
  ACPI: APEI: Put the boot error record table after parsing
  ACPI: watchdog: Put the watchdog action table after parsing
  ACPI: LPIT: Put the low power idle table after using it
parents 6e6c2528 2d2feb68 95722237

drivers/acpi/acpi_lpit.c

+2 −1
Original line number Diff line number Diff line
@@ -151,10 +151,11 @@ void acpi_init_lpit(void) 
	struct acpi_table_lpit *lpit;



	status = acpi_get_table(ACPI_SIG_LPIT, 0, (struct acpi_table_header **)&lpit);



	if (ACPI_FAILURE(status))

		return;



	lpit_process((u64)lpit + sizeof(*lpit),

		     (u64)lpit + lpit->header.length);



	acpi_put_table((struct acpi_table_header *)lpit);

}

drivers/acpi/acpi_watchdog.c

+5 −2
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void) 
	}



	if (acpi_watchdog_uses_rtc(wdat)) {

		acpi_put_table((struct acpi_table_header *)wdat);

		pr_info("Skipping WDAT on this system because it uses RTC SRAM\n");

		return NULL;

	}
@@ -117,12 +118,12 @@ void __init acpi_watchdog_init(void) 


	/* Watchdog disabled by BIOS */

	if (!(wdat->flags & ACPI_WDAT_ENABLED))

		return;

		goto fail_put_wdat;



	/* Skip legacy PCI WDT devices */

	if (wdat->pci_segment != 0xff || wdat->pci_bus != 0xff ||

	    wdat->pci_device != 0xff || wdat->pci_function != 0xff)

		return;

		goto fail_put_wdat;



	INIT_LIST_HEAD(&resource_list);
@@ -188,4 +189,6 @@ void __init acpi_watchdog_init(void) 


fail_free_resource_list:

	resource_list_free(&resource_list);

fail_put_wdat:

	acpi_put_table((struct acpi_table_header *)wdat);

}

drivers/acpi/acpica/acglobal.h

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ ACPI_GLOBAL(struct acpi_external_file *, acpi_gbl_external_file_list); 
#ifdef ACPI_DEBUGGER

ACPI_INIT_GLOBAL(u8, acpi_gbl_abort_method, FALSE);

ACPI_INIT_GLOBAL(acpi_thread_id, acpi_gbl_db_thread_id, ACPI_INVALID_THREAD_ID);

ACPI_INIT_GLOBAL(u32, acpi_gbl_next_cmd_num, 1);



ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_ini_methods);

ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_region_support);

drivers/acpi/acpica/acpredef.h

+2 −2
Original line number Diff line number Diff line
@@ -640,10 +640,10 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 
	{{"_NIC", METHOD_0ARGS,	/* ACPI 6.3 */

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},



	{{"_NIG", METHOD_1ARGS(ACPI_TYPE_BUFFER),	/* ACPI 6.3 */

	{{"_NIG", METHOD_0ARGS, /* ACPI 6.3 */

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},



	{{"_NIH", METHOD_0ARGS,	/* ACPI 6.3 */

	{{"_NIH", METHOD_1ARGS(ACPI_TYPE_BUFFER), /* ACPI 6.3 */

	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},



	{{"_NTT", METHOD_0ARGS,

drivers/acpi/acpica/dbhistry.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static HISTORY_INFO acpi_gbl_history_buffer[HISTORY_SIZE]; 
static u16 acpi_gbl_lo_history = 0;

static u16 acpi_gbl_num_history = 0;

static u16 acpi_gbl_next_history_index = 0;

u32 acpi_gbl_next_cmd_num = 1;



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

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE