Skip to content

Commit ede439b

Browse files
committed
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20200528 ACPICA: iASL: add new OperationRegion subtype keyword PlatformRtMechanism ACPICA: acpidump: Removed dead code from oslinuxtbl.c
2 parents 118d6e9 + 34a09bf commit ede439b

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

drivers/acpi/acpica/dbdisply.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ static acpi_adr_space_type acpi_gbl_space_id_list[] = {
5151
ACPI_ADR_SPACE_IPMI,
5252
ACPI_ADR_SPACE_GPIO,
5353
ACPI_ADR_SPACE_GSBUS,
54+
ACPI_ADR_SPACE_PLATFORM_COMM,
55+
ACPI_ADR_SPACE_PLATFORM_RT,
5456
ACPI_ADR_SPACE_DATA_TABLE,
5557
ACPI_ADR_SPACE_FIXED_HARDWARE
5658
};

drivers/acpi/acpica/utdecode.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
7878
"IPMI", /* 0x07 */
7979
"GeneralPurposeIo", /* 0x08 */
8080
"GenericSerialBus", /* 0x09 */
81-
"PCC" /* 0x0A */
81+
"PCC", /* 0x0A */
82+
"PlatformRtMechanism" /* 0x0B */
8283
};
8384

8485
const char *acpi_ut_get_region_name(u8 space_id)

include/acpi/acpixf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/* Current ACPICA subsystem version in YYYYMMDD format */
1414

15-
#define ACPI_CA_VERSION 0x20200430
15+
#define ACPI_CA_VERSION 0x20200528
1616

1717
#include <acpi/acconfig.h>
1818
#include <acpi/actypes.h>

include/acpi/actypes.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,9 @@ typedef u8 acpi_adr_space_type;
815815
#define ACPI_ADR_SPACE_GPIO (acpi_adr_space_type) 8
816816
#define ACPI_ADR_SPACE_GSBUS (acpi_adr_space_type) 9
817817
#define ACPI_ADR_SPACE_PLATFORM_COMM (acpi_adr_space_type) 10
818+
#define ACPI_ADR_SPACE_PLATFORM_RT (acpi_adr_space_type) 11
818819

819-
#define ACPI_NUM_PREDEFINED_REGIONS 11
820+
#define ACPI_NUM_PREDEFINED_REGIONS 12
820821

821822
/*
822823
* Special Address Spaces

tools/power/acpi/os_specific/service_layers/oslinuxtbl.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance);
3535
static acpi_status
3636
osl_read_table_from_file(char *filename,
3737
acpi_size file_offset,
38-
char *signature, struct acpi_table_header **table);
38+
struct acpi_table_header **table);
3939

4040
static acpi_status
4141
osl_map_table(acpi_size address,
@@ -1184,8 +1184,6 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
11841184
*
11851185
* PARAMETERS: filename - File that contains the desired table
11861186
* file_offset - Offset of the table in file
1187-
* signature - Optional ACPI Signature for desired table.
1188-
* A null terminated 4-character string.
11891187
* table - Where a pointer to the table is returned
11901188
*
11911189
* RETURN: Status; Table buffer is returned if AE_OK.
@@ -1197,7 +1195,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
11971195
static acpi_status
11981196
osl_read_table_from_file(char *filename,
11991197
acpi_size file_offset,
1200-
char *signature, struct acpi_table_header **table)
1198+
struct acpi_table_header **table)
12011199
{
12021200
FILE *table_file;
12031201
struct acpi_table_header header;
@@ -1225,6 +1223,8 @@ osl_read_table_from_file(char *filename,
12251223
goto exit;
12261224
}
12271225

1226+
#ifdef ACPI_OBSOLETE_FUNCTIONS
1227+
12281228
/* If signature is specified, it must match the table */
12291229

12301230
if (signature) {
@@ -1244,6 +1244,7 @@ osl_read_table_from_file(char *filename,
12441244
goto exit;
12451245
}
12461246
}
1247+
#endif
12471248

12481249
table_length = ap_get_table_length(&header);
12491250
if (table_length == 0) {
@@ -1366,7 +1367,7 @@ osl_get_customized_table(char *pathname,
13661367
/* There is no physical address saved for customized tables, use zero */
13671368

13681369
*address = 0;
1369-
status = osl_read_table_from_file(table_filename, 0, NULL, table);
1370+
status = osl_read_table_from_file(table_filename, 0, table);
13701371

13711372
return (status);
13721373
}

0 commit comments

Comments
 (0)