ACPI: APEI: EINJ: Add einjv2 extension struct

Add einjv2 extension struct and EINJv2 error types to prepare
the driver for EINJv2 support. ACPI specifications[1] enables
EINJv2 by extending set_error_type_with_address struct.

Link: https://uefi.org/specs/ACPI/6.6/18_Platform_Error_Interfaces.html#einjv2-extension-structure
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Zaid Alali <zaidal@os.amperecomputing.com>
Link: https://patch.msgid.link/20250617193026.637510-4-zaidal@os.amperecomputing.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c
index a1ff42c226fba7d069bc49c13a5d69a6d974f58e..1ffe8270634c22707476d261eb2e270f258f4a25 100644 (file)
--- a/drivers/acpi/apei/einj-core.c
+++ b/drivers/acpi/apei/einj-core.c
@@ -33,6 +33,7 @@
 #define SLEEP_UNIT_MAX         5000                    /* 5ms */
 /* Firmware should respond within 1 seconds */
 #define FIRMWARE_TIMEOUT       (1 * USEC_PER_SEC)
+#define COMPONENT_LEN          16
 #define ACPI65_EINJV2_SUPP     BIT(30)
 #define ACPI5_VENDOR_BIT       BIT(31)
 #define MEM_ERROR_MASK         (ACPI_EINJ_MEMORY_CORRECTABLE | \
@@ -50,6 +51,28 @@
  */
 static int acpi5;
 
+struct syndrome_array {
+       union {
+               u8      acpi_id[COMPONENT_LEN];
+               u8      device_id[COMPONENT_LEN];
+               u8      pcie_sbdf[COMPONENT_LEN];
+               u8      vendor_id[COMPONENT_LEN];
+       } comp_id;
+       union {
+               u8      proc_synd[COMPONENT_LEN];
+               u8      mem_synd[COMPONENT_LEN];
+               u8      pcie_synd[COMPONENT_LEN];
+               u8      vendor_synd[COMPONENT_LEN];
+       } comp_synd;
+};
+
+struct einjv2_extension_struct {
+       u32 length;
+       u16 revision;
+       u16 component_arr_count;
+       struct syndrome_array component_arr[] __counted_by(component_arr_count);
+};
+
 struct set_error_type_with_address {
        u32     type;
        u32     vendor_extension;
@@ -58,6 +81,7 @@ struct set_error_type_with_address {
        u64     memory_address;
        u64     memory_address_range;
        u32     pcie_sbdf;
+       struct  einjv2_extension_struct einjv2_struct;
 };
 enum {
        SETWA_FLAGS_APICID = 1,