Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+13 -8
+2
drivers/acpi/acpica/dbdisply.c
··· 51 51 ACPI_ADR_SPACE_IPMI, 52 52 ACPI_ADR_SPACE_GPIO, 53 53 ACPI_ADR_SPACE_GSBUS, 54 + ACPI_ADR_SPACE_PLATFORM_COMM, 55 + ACPI_ADR_SPACE_PLATFORM_RT, 54 56 ACPI_ADR_SPACE_DATA_TABLE, 55 57 ACPI_ADR_SPACE_FIXED_HARDWARE 56 58 };
+2 -1
drivers/acpi/acpica/utdecode.c
··· 78 78 "IPMI", /* 0x07 */ 79 79 "GeneralPurposeIo", /* 0x08 */ 80 80 "GenericSerialBus", /* 0x09 */ 81 - "PCC" /* 0x0A */ 81 + "PCC", /* 0x0A */ 82 + "PlatformRtMechanism" /* 0x0B */ 82 83 }; 83 84 84 85 const char *acpi_ut_get_region_name(u8 space_id)
+1 -1
include/acpi/acpixf.h
··· 12 12 13 13 /* Current ACPICA subsystem version in YYYYMMDD format */ 14 14 15 - #define ACPI_CA_VERSION 0x20200430 15 + #define ACPI_CA_VERSION 0x20200528 16 16 17 17 #include <acpi/acconfig.h> 18 18 #include <acpi/actypes.h>
+2 -1
include/acpi/actypes.h
··· 815 815 #define ACPI_ADR_SPACE_GPIO (acpi_adr_space_type) 8 816 816 #define ACPI_ADR_SPACE_GSBUS (acpi_adr_space_type) 9 817 817 #define ACPI_ADR_SPACE_PLATFORM_COMM (acpi_adr_space_type) 10 818 + #define ACPI_ADR_SPACE_PLATFORM_RT (acpi_adr_space_type) 11 818 819 819 - #define ACPI_NUM_PREDEFINED_REGIONS 11 820 + #define ACPI_NUM_PREDEFINED_REGIONS 12 820 821 821 822 /* 822 823 * Special Address Spaces
+6 -5
tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
··· 35 35 static acpi_status 36 36 osl_read_table_from_file(char *filename, 37 37 acpi_size file_offset, 38 - char *signature, struct acpi_table_header **table); 38 + struct acpi_table_header **table); 39 39 40 40 static acpi_status 41 41 osl_map_table(acpi_size address, ··· 1184 1184 * 1185 1185 * PARAMETERS: filename - File that contains the desired table 1186 1186 * file_offset - Offset of the table in file 1187 - * signature - Optional ACPI Signature for desired table. 1188 - * A null terminated 4-character string. 1189 1187 * table - Where a pointer to the table is returned 1190 1188 * 1191 1189 * RETURN: Status; Table buffer is returned if AE_OK. ··· 1195 1197 static acpi_status 1196 1198 osl_read_table_from_file(char *filename, 1197 1199 acpi_size file_offset, 1198 - char *signature, struct acpi_table_header **table) 1200 + struct acpi_table_header **table) 1199 1201 { 1200 1202 FILE *table_file; 1201 1203 struct acpi_table_header header; ··· 1223 1225 goto exit; 1224 1226 } 1225 1227 1228 + #ifdef ACPI_OBSOLETE_FUNCTIONS 1229 + 1226 1230 /* If signature is specified, it must match the table */ 1227 1231 1228 1232 if (signature) { ··· 1244 1244 goto exit; 1245 1245 } 1246 1246 } 1247 + #endif 1247 1248 1248 1249 table_length = ap_get_table_length(&header); 1249 1250 if (table_length == 0) { ··· 1367 1366 /* There is no physical address saved for customized tables, use zero */ 1368 1367 1369 1368 *address = 0; 1370 - status = osl_read_table_from_file(table_filename, 0, NULL, table); 1369 + status = osl_read_table_from_file(table_filename, 0, table); 1371 1370 1372 1371 return (status); 1373 1372 }