ras: acpi/apei: cper: add support for generic data v3 structure

[mirror_ubuntu-zesty-kernel.git] / drivers / firmware / efi / cper.c

diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
index d4253742543841d6d261dfea22156259b0a13183..90247570431103193af874c8a5e44d7fad5e82df 100644 (file)
--- a/drivers/firmware/efi/cper.c
+++ b/drivers/firmware/efi/cper.c
@@ -32,6 +32,7 @@
 #include <linux/acpi.h>
 #include <linux/pci.h>
 #include <linux/aer.h>
+#include <acpi/ghes.h>
 
 #define INDENT_SP      " "
 
@@ -386,8 +387,9 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,
        pfx, pcie->bridge.secondary_status, pcie->bridge.control);
 }
 
-static void cper_estatus_print_section(
-       const char *pfx, const struct acpi_hest_generic_data *gdata, int sec_no)
+static void
+cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata,
+                          int sec_no)
 {
        uuid_le *sec_type = (uuid_le *)gdata->section_type;
        __u16 severity;
@@ -403,14 +405,16 @@ static void cper_estatus_print_section(
 
        snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP);
        if (!uuid_le_cmp(*sec_type, CPER_SEC_PROC_GENERIC)) {
-               struct cper_sec_proc_generic *proc_err = (void *)(gdata + 1);
+               struct cper_sec_proc_generic *proc_err = acpi_hest_get_payload(gdata);
+
                printk("%s""section_type: general processor error\n", newpfx);
                if (gdata->error_data_length >= sizeof(*proc_err))
                        cper_print_proc_generic(newpfx, proc_err);
                else
                        goto err_section_too_small;
        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
-               struct cper_sec_mem_err *mem_err = (void *)(gdata + 1);
+               struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);
+
                printk("%s""section_type: memory error\n", newpfx);
                if (gdata->error_data_length >=
                    sizeof(struct cper_sec_mem_err_old))
@@ -419,7 +423,8 @@ static void cper_estatus_print_section(
                else
                        goto err_section_too_small;
        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) {
-               struct cper_sec_pcie *pcie = (void *)(gdata + 1);
+               struct cper_sec_pcie *pcie = acpi_hest_get_payload(gdata);
+
                printk("%s""section_type: PCIe error\n", newpfx);
                if (gdata->error_data_length >= sizeof(*pcie))
                        cper_print_pcie(newpfx, pcie, gdata);
@@ -438,7 +443,7 @@ void cper_estatus_print(const char *pfx,
                        const struct acpi_hest_generic_status *estatus)
 {
        struct acpi_hest_generic_data *gdata;
-       unsigned int data_len, gedata_len;
+       unsigned int data_len;
        int sec_no = 0;
        char newpfx[64];
        __u16 severity;
@@ -452,11 +457,11 @@ void cper_estatus_print(const char *pfx,
        data_len = estatus->data_length;
        gdata = (struct acpi_hest_generic_data *)(estatus + 1);
        snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP);
-       while (data_len >= sizeof(*gdata)) {
-               gedata_len = gdata->error_data_length;
+
+       while (data_len >= acpi_hest_get_size(gdata)) {
                cper_estatus_print_section(newpfx, gdata, sec_no);
-               data_len -= gedata_len + sizeof(*gdata);
-               gdata = (void *)(gdata + 1) + gedata_len;
+               data_len -= acpi_hest_get_record_size(gdata);
+               gdata = acpi_hest_get_next(gdata);
                sec_no++;
        }
 }
@@ -486,12 +491,14 @@ int cper_estatus_check(const struct acpi_hest_generic_status *estatus)
                return rc;
        data_len = estatus->data_length;
        gdata = (struct acpi_hest_generic_data *)(estatus + 1);
-       while (data_len >= sizeof(*gdata)) {
-               gedata_len = gdata->error_data_length;
-               if (gedata_len > data_len - sizeof(*gdata))
+
+       while (data_len >= acpi_hest_get_size(gdata)) {
+               gedata_len = acpi_hest_get_error_length(gdata);
+               if (gedata_len > data_len - acpi_hest_get_size(gdata))
                        return -EINVAL;
-               data_len -= gedata_len + sizeof(*gdata);
-               gdata = (void *)(gdata + 1) + gedata_len;
+
+               data_len -= acpi_hest_get_record_size(gdata);
+               gdata = acpi_hest_get_next(gdata);
        }
        if (data_len)
                return -EINVAL;