[PATCH v2 26/42] ACPICA: actbl2: MPAM: adapt to MPAM ACPI spec v3.1
From: Maciej Wieczor-Retman
Date: Fri Nov 20 2026 - 12:22:33 EST
From: Andre Przywara <andre.przywara@xxxxxxx>
The latest edition of the "ACPI for MPAM Platform Design Document" (ARM
DEN0065C [1]) re-purposes the current Reserved2 field in the MPAM ACPI
table to hold an offset value for the MPAM Firmware backed interface.
Also the MSC structure gets abstracted a bit, which renames the Reserved
field to type, although it stays at 0, for the time being.
Rename and describe the new fields in the table struct definition.
[1] https://support.arm.com/documentation/den0065/latest
Link: https://github.com/acpica/acpica/commit/4f4a36a99c1d
Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@xxxxxxxxx>
---
drivers/acpi/arm64/mpam.c | 6 +++---
include/acpi/actbl2.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/arm64/mpam.c b/drivers/acpi/arm64/mpam.c
index c57bd367922b..671ba501379a 100644
--- a/drivers/acpi/arm64/mpam.c
+++ b/drivers/acpi/arm64/mpam.c
@@ -331,14 +331,14 @@ static int __init acpi_mpam_parse(void)
table_offset += tbl_msc->length;
/*
- * If any of the reserved fields are set, make no attempt to
- * parse the MSC structure. This MSC will still be counted by
+ * If the reserved1 field is set, make no attempt to parse the
+ * MSC structure. This MSC will still be counted by
* acpi_mpam_count_msc(), meaning the MPAM driver can't probe
* against all MSC, and will never be enabled. There is no way
* to enable it safely, because we cannot determine safe
* system-wide partid and pmg ranges in this situation.
*/
- if (tbl_msc->reserved || tbl_msc->reserved1 || tbl_msc->reserved2) {
+ if (tbl_msc->reserved1) {
pr_err_once("Unrecognised MSC, MPAM not usable\n");
pr_debug("MSC.%u: reserved field set\n", tbl_msc->identifier);
continue;
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 9af7c51d1297..8e0d5156e6d6 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -2004,7 +2004,7 @@ struct acpi_mpam_resource_node {
struct acpi_mpam_msc_node {
u16 length;
u8 interface_type;
- u8 reserved;
+ u8 type;
u32 identifier;
u64 base_address;
u32 mmio_size;
@@ -2014,7 +2014,7 @@ struct acpi_mpam_msc_node {
u32 overflow_interrupt_affinity;
u32 error_interrupt;
u32 error_interrupt_flags;
- u32 reserved2;
+ u32 mpam_fb_offset;
u32 error_interrupt_affinity;
u32 max_nrdy_usec;
u64 hardware_id_linked_device;
--
2.56.0