stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-10-31 17:04:14 +10:00
Code Issues Releases Wiki Activity

Merge branch 'acpica'

Browse Source 
* acpica:
  ACPICA: Update version to 20200528
  ACPICA: iASL: add new OperationRegion subtype keyword PlatformRtMechanism
  ACPICA: acpidump: Removed dead code from oslinuxtbl.c
This commit is contained in:
Rafael J. Wysocki 2020-06-10 17:27:28 +02:00
commit ede439be68
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/acpica/dbdisply.c
View File

@ -51,6 +51,8 @@ static acpi_adr_space_type acpi_gbl_space_id_list[] = {
ACPI_ADR_SPACE_IPMI,
ACPI_ADR_SPACE_GPIO,
ACPI_ADR_SPACE_GSBUS,
ACPI_ADR_SPACE_PLATFORM_COMM,
ACPI_ADR_SPACE_PLATFORM_RT,
ACPI_ADR_SPACE_DATA_TABLE,
ACPI_ADR_SPACE_FIXED_HARDWARE
};

3
drivers/acpi/acpica/utdecode.c
View File

@ -78,7 +78,8 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
"IPMI", /* 0x07 */
"GeneralPurposeIo", /* 0x08 */
"GenericSerialBus", /* 0x09 */
"PCC" /* 0x0A */
"PCC", /* 0x0A */
"PlatformRtMechanism" /* 0x0B */
};
const char *acpi_ut_get_region_name(u8 space_id)

2
include/acpi/acpixf.h
View File

@ -12,7 +12,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20200430
#define ACPI_CA_VERSION 0x20200528
#include <acpi/acconfig.h>
#include <acpi/actypes.h>

3
include/acpi/actypes.h
View File

@ -815,8 +815,9 @@ typedef u8 acpi_adr_space_type;
#define ACPI_ADR_SPACE_GPIO (acpi_adr_space_type) 8
#define ACPI_ADR_SPACE_GSBUS (acpi_adr_space_type) 9
#define ACPI_ADR_SPACE_PLATFORM_COMM (acpi_adr_space_type) 10
#define ACPI_ADR_SPACE_PLATFORM_RT (acpi_adr_space_type) 11
#define ACPI_NUM_PREDEFINED_REGIONS 11
#define ACPI_NUM_PREDEFINED_REGIONS 12
/*
* Special Address Spaces

11
tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
View File

@ -35,7 +35,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance);
static acpi_status
osl_read_table_from_file(char *filename,
acpi_size file_offset,
char *signature, struct acpi_table_header **table);
struct acpi_table_header **table);
static acpi_status
osl_map_table(acpi_size address,
@ -1184,8 +1184,6 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
*
* PARAMETERS: filename - File that contains the desired table
* file_offset - Offset of the table in file
* signature - Optional ACPI Signature for desired table.
* A null terminated 4-character string.
* table - Where a pointer to the table is returned
*
* RETURN: Status; Table buffer is returned if AE_OK.
@ -1197,7 +1195,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
static acpi_status
osl_read_table_from_file(char *filename,
acpi_size file_offset,
char *signature, struct acpi_table_header **table)
struct acpi_table_header **table)
{
FILE *table_file;
struct acpi_table_header header;
@ -1225,6 +1223,8 @@ osl_read_table_from_file(char *filename,
goto exit;
}
#ifdef ACPI_OBSOLETE_FUNCTIONS
/* If signature is specified, it must match the table */
if (signature) {
@ -1244,6 +1244,7 @@ osl_read_table_from_file(char *filename,
goto exit;
}
}
#endif
table_length = ap_get_table_length(&header);
if (table_length == 0) {
@ -1366,7 +1367,7 @@ osl_get_customized_table(char *pathname,
/* There is no physical address saved for customized tables, use zero */
*address = 0;
status = osl_read_table_from_file(table_filename, 0, NULL, table);
status = osl_read_table_from_file(table_filename, 0, table);
return (status);
}