hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/8677 -------------------------------- This reverts commit b9c7bcaf7b0531bade10dfed2a453e0b40e62d20. This patch follow the latest UEFI/2.10 2.9A data structure specs description. In downstream CI environment, their Bios version just follow UEFI 2.8 verison, which has error type parse conflict. Since now all released BIOS version still following UEFI 2.8, revert this LTS patch to keep consistency. Fixes: b9c7bcaf7b05 ("efi/cper: align ARM CPER type with UEFI 2.9A/2.10 specs") Signed-off-by: Xinyu Zheng <zhengxinyu6@huawei.com> --- drivers/acpi/apei/ghes.c | 16 ++++------- drivers/firmware/efi/cper-arm.c | 50 +++++++++++++++++---------------- include/linux/cper.h | 10 +++---- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 4c3dee093745..34ab844bd013 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -22,7 +22,6 @@ #include <linux/moduleparam.h> #include <linux/init.h> #include <linux/acpi.h> -#include <linux/bitfield.h> #include <linux/io.h> #include <linux/interrupt.h> #include <linux/timer.h> @@ -608,7 +607,6 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, { struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata); int flags = sync ? MF_ACTION_REQUIRED : 0; - char error_type[120]; bool queued = false; int sec_sev, i; bool critical; @@ -627,8 +625,9 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, critical = ghes_armp_vendor_critical_error(err, sync); for (i = 0; i < err->err_info_num; i++) { struct cper_arm_err_info *err_info = (struct cper_arm_err_info *)p; - bool is_cache = err_info->type & CPER_ARM_CACHE_ERROR; + bool is_cache = (err_info->type == CPER_ARM_CACHE_ERROR); bool has_pa = (err_info->validation_bits & CPER_ARM_INFO_VALID_PHYSICAL_ADDR); + const char *error_type = "unknown error"; /* * The field (err_info->error_info & BIT(26)) is fixed to set to @@ -642,15 +641,12 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, continue; } - cper_bits_to_str(error_type, sizeof(error_type), - FIELD_GET(CPER_ARM_ERR_TYPE_MASK, err_info->type), - cper_proc_error_type_strs, - ARRAY_SIZE(cper_proc_error_type_strs)); + if (err_info->type < ARRAY_SIZE(cper_proc_error_type_strs)) + error_type = cper_proc_error_type_strs[err_info->type]; pr_warn_ratelimited(FW_WARN GHES_PFX - "Unhandled processor error type 0x%02x: %s%s\n", - err_info->type, error_type, - (err_info->type & ~CPER_ARM_ERR_TYPE_MASK) ? " with reserved bit(s)" : ""); + "Unhandled processor error type: %s\n", + error_type); p += err_info->length; } diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-arm.c index 52d18490b59e..eb7ee6af55f2 100644 --- a/drivers/firmware/efi/cper-arm.c +++ b/drivers/firmware/efi/cper-arm.c @@ -93,11 +93,15 @@ static void cper_print_arm_err_info(const char *pfx, u32 type, bool proc_context_corrupt, corrected, precise_pc, restartable_pc; bool time_out, access_mode; + /* If the type is unknown, bail. */ + if (type > CPER_ARM_MAX_TYPE) + return; + /* * Vendor type errors have error information values that are vendor * specific. */ - if (type & CPER_ARM_VENDOR_ERROR) + if (type == CPER_ARM_VENDOR_ERROR) return; if (error_info & CPER_ARM_ERR_VALID_TRANSACTION_TYPE) { @@ -112,38 +116,43 @@ static void cper_print_arm_err_info(const char *pfx, u32 type, if (error_info & CPER_ARM_ERR_VALID_OPERATION_TYPE) { op_type = ((error_info >> CPER_ARM_ERR_OPERATION_SHIFT) & CPER_ARM_ERR_OPERATION_MASK); - if (type & CPER_ARM_CACHE_ERROR) { + switch (type) { + case CPER_ARM_CACHE_ERROR: if (op_type < ARRAY_SIZE(arm_cache_err_op_strs)) { - printk("%scache error, operation type: %s\n", pfx, + printk("%soperation type: %s\n", pfx, arm_cache_err_op_strs[op_type]); } - } - if (type & CPER_ARM_TLB_ERROR) { + break; + case CPER_ARM_TLB_ERROR: if (op_type < ARRAY_SIZE(arm_tlb_err_op_strs)) { - printk("%sTLB error, operation type: %s\n", pfx, + printk("%soperation type: %s\n", pfx, arm_tlb_err_op_strs[op_type]); } - } - if (type & CPER_ARM_BUS_ERROR) { + break; + case CPER_ARM_BUS_ERROR: if (op_type < ARRAY_SIZE(arm_bus_err_op_strs)) { - printk("%sbus error, operation type: %s\n", pfx, + printk("%soperation type: %s\n", pfx, arm_bus_err_op_strs[op_type]); } + break; } } if (error_info & CPER_ARM_ERR_VALID_LEVEL) { level = ((error_info >> CPER_ARM_ERR_LEVEL_SHIFT) & CPER_ARM_ERR_LEVEL_MASK); - if (type & CPER_ARM_CACHE_ERROR) + switch (type) { + case CPER_ARM_CACHE_ERROR: printk("%scache level: %d\n", pfx, level); - - if (type & CPER_ARM_TLB_ERROR) + break; + case CPER_ARM_TLB_ERROR: printk("%sTLB level: %d\n", pfx, level); - - if (type & CPER_ARM_BUS_ERROR) + break; + case CPER_ARM_BUS_ERROR: printk("%saffinity level at which the bus error occurred: %d\n", pfx, level); + break; + } } if (error_info & CPER_ARM_ERR_VALID_PROC_CONTEXT_CORRUPT) { @@ -232,7 +241,6 @@ void cper_print_proc_arm(const char *pfx, struct cper_arm_err_info *err_info; struct cper_arm_ctx_info *ctx_info; char newpfx[64], infopfx[ARRAY_SIZE(newpfx) + 1]; - char error_type[120]; printk("%sMIDR: 0x%016llx\n", pfx, proc->midr); @@ -281,15 +289,9 @@ void cper_print_proc_arm(const char *pfx, newpfx); } - cper_bits_to_str(error_type, sizeof(error_type), - FIELD_GET(CPER_ARM_ERR_TYPE_MASK, err_info->type), - cper_proc_error_type_strs, - ARRAY_SIZE(cper_proc_error_type_strs)); - - printk("%serror_type: 0x%02x: %s%s\n", newpfx, err_info->type, - error_type, - (err_info->type & ~CPER_ARM_ERR_TYPE_MASK) ? " with reserved bit(s)" : ""); - + printk("%serror_type: %d, %s\n", newpfx, err_info->type, + err_info->type < ARRAY_SIZE(cper_proc_error_type_strs) ? + cper_proc_error_type_strs[err_info->type] : "unknown"); if (err_info->validation_bits & CPER_ARM_INFO_VALID_ERR_INFO) { printk("%serror_info: 0x%016llx\n", newpfx, err_info->error_info); diff --git a/include/linux/cper.h b/include/linux/cper.h index eb5c54814e76..e94724818bc2 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h @@ -274,11 +274,11 @@ enum { #define CPER_ARM_INFO_FLAGS_PROPAGATED BIT(2) #define CPER_ARM_INFO_FLAGS_OVERFLOW BIT(3) -#define CPER_ARM_ERR_TYPE_MASK GENMASK(4,1) -#define CPER_ARM_CACHE_ERROR BIT(1) -#define CPER_ARM_TLB_ERROR BIT(2) -#define CPER_ARM_BUS_ERROR BIT(3) -#define CPER_ARM_VENDOR_ERROR BIT(4) +#define CPER_ARM_CACHE_ERROR 0 +#define CPER_ARM_TLB_ERROR 1 +#define CPER_ARM_BUS_ERROR 2 +#define CPER_ARM_VENDOR_ERROR 3 +#define CPER_ARM_MAX_TYPE CPER_ARM_VENDOR_ERROR #define CPER_ARM_ERR_VALID_TRANSACTION_TYPE BIT(0) #define CPER_ARM_ERR_VALID_OPERATION_TYPE BIT(1) -- 2.34.1