mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More ACPI updates for 5.8-rc1 

Update the ACPICA code in the kernel to upstream revision 20200528
 with the following changes:
 
  - Remove some dead code from the acpidump utility (Bob Moore).
 
  - Add new OperationRegion subtype keyword PlatformRtMechanism
    to the compiler (Erik Kaneda).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl7g/s0SHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxi28QAIIdbzEulb9nQuynVXb2Vdohbu4d2Pm7
 RQJ5Q3gq89RAYkmL8lh7As8RL9B2w1ePaOOWvSDL44JDxCXejW1DZqCKVaRrdtiw
 e03OxKzCz3Xh4f9tOp1vsnxEssPmf19CSXmGeCA1i7Altu0RCxkW5apCv9ld5N5Y
 LA2vdidNDuK5iAgIn1jkZCfb4jRlXyYizOLn9v/zkg6Zjq6zaDsIrEbzI+Bb7ooX
 jnUhU+tG9Q1K+DR5fa9MgG1xV3F/CCfxaePOVVpRQqPWLHhmhJ9ewCkavVIeekz0
 tgnqrVJFqihjlWJLNMXs6NRvN0AznGuCewb3fV1Y6k2TwMcvAEjJ4sht790g0PIC
 WHPo0k1EF+cbTJ9qNaIrNMoXgkZrR/HN4R7nuSRBdgTE+Y2E0ymcEQilBboaJB6z
 Yci6jPRyDm/1Zst/PmJ5zASCbx5aCzAACcS7m1okvq+AvPH9Twu3II4f9se5Dpq8
 mWbkaJcsEJanx/J5pakzxvzPp7pTCF2113XFJ1sfLw08Vzxmq+b4m4IuEflXbWL3
 HBnYP63DFYc3xWpJgsZxsAGyr0Qdts1/FY0UufoB5bj0hZ4++NgcouixsUiBq16s
 FlLACApszCbyFK+qQao+ZMa7p5if1d4CYFqWFu0xVW4DsQAug7an76PZ+XY2PyPv
 kNSb5eodaFS8
 =fzrg
 -----END PGP SIGNATURE-----

Merge tag 'acpi-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more ACPI updates from Rafael Wysocki:
 "Update the ACPICA code in the kernel to upstream revision 20200528
  with the following changes:

   - Remove some dead code from the acpidump utility (Bob Moore)

   - Add new OperationRegion subtype keyword PlatformRtMechanism to the
     compiler (Erik Kaneda)"

* tag 'acpi-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  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:
Linus Torvalds 2020-06-10 14:09:08 -07:00
parent 0c67f6b297 ede439be68
commit 6672966d6c
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);
}