diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-02 17:59:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-02 17:59:53 +0100 |
| commit | 9cb31aa155bafd384b373fb91072fdb02aa35eaf (patch) | |
| tree | 403a494352dd734d28892de384d465273cdb97cc /include/acpi/actbl3.h | |
| parent | d5a8fb654c3bfc25d585802d2e63a5ccccd7a912 (diff) | |
| parent | 93792be6424aafd6fb59b2a1eef914ef9e91fdcb (diff) | |
Merge branch 'acpica'
Merge ACPICA updates for 5.16-rc1:
- Fix system-wide resume issue caused by evaluating control methods
too early in the resume path (Rafael Wysocki).
- Add support for Windows 2020 _OSI string (Mario Limonciello).
- Add Generic Port Affinity type for SRAT (Alison Schofield).
- Add disassembly support for the NHLT ACPI table (Bob Moore).
* acpica:
ACPICA: Update version to 20210930
ACPICA: iASL table disassembler: Added disassembly support for the NHLT ACPI table
ACPICA: ACPI 6.4 SRAT: add Generic Port Affinity type
ACPICA: Add support for Windows 2020 _OSI string
ACPICA: Avoid evaluating methods too early during system resume
Diffstat (limited to 'include/acpi/actbl3.h')
| -rw-r--r-- | include/acpi/actbl3.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h index 9125e2f16329..edbf1ad8206d 100644 --- a/include/acpi/actbl3.h +++ b/include/acpi/actbl3.h @@ -191,7 +191,8 @@ enum acpi_srat_type { ACPI_SRAT_TYPE_GICC_AFFINITY = 3, ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */ ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5, /* ACPI 6.3 */ - ACPI_SRAT_TYPE_RESERVED = 6 /* 5 and greater are reserved */ + ACPI_SRAT_TYPE_GENERIC_PORT_AFFINITY = 6, /* ACPI 6.4 */ + ACPI_SRAT_TYPE_RESERVED = 7 /* 7 and greater are reserved */ }; /* @@ -272,7 +273,11 @@ struct acpi_srat_gic_its_affinity { u32 its_id; }; -/* 5: Generic Initiator Affinity Structure (ACPI 6.3) */ +/* + * Common structure for SRAT subtable types: + * 5: ACPI_SRAT_TYPE_GENERIC_AFFINITY + * 6: ACPI_SRAT_TYPE_GENERIC_PORT_AFFINITY + */ struct acpi_srat_generic_affinity { struct acpi_subtable_header header; |