ACPI, APEI, CPER: Cleanup CPER memory error output format

Memory error reporting is much too verbose.  Most users do not care about
the DIMM internal bank/row/column information. Downgrade the fine details
to "pr_debug" status so that those few who do care can get them if they
really want to.  The detail information will be later be provided by
perf/trace interface.
Since things are still a bit scary, and users are sometimes overly
nervous, provide a reassuring message that corrected errors do not
generally require any further action.

Suggested-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Chen, Gong <gong.chen@linux.intel.com>
Reviewed-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
index b1a8a55915d907cce1527e01f4a367ad490bd02d..1491dd4f08f9f1526718835a3e4ef63c86d1e659 100644 (file)
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 #include <linux/aer.h>
 
+#define INDENT_SP      " "
 /*
  * CPER record ID need to be unique even after reboot, because record
  * ID is used as index for ERST storage, while CPER records from
@@ -206,29 +207,29 @@ static void cper_print_mem(const char *pfx, const struct cper_sec_mem_err *mem)
                printk("%s""physical_address_mask: 0x%016llx\n",
                       pfx, mem->physical_addr_mask);
        if (mem->validation_bits & CPER_MEM_VALID_NODE)
-               printk("%s""node: %d\n", pfx, mem->node);
+               pr_debug("node: %d\n", mem->node);
        if (mem->validation_bits & CPER_MEM_VALID_CARD)
-               printk("%s""card: %d\n", pfx, mem->card);
+               pr_debug("card: %d\n", mem->card);
        if (mem->validation_bits & CPER_MEM_VALID_MODULE)
-               printk("%s""module: %d\n", pfx, mem->module);
+               pr_debug("module: %d\n", mem->module);
        if (mem->validation_bits & CPER_MEM_VALID_RANK_NUMBER)
-               printk("%s""rank: %d\n", pfx, mem->rank);
+               pr_debug("rank: %d\n", mem->rank);
        if (mem->validation_bits & CPER_MEM_VALID_BANK)
-               printk("%s""bank: %d\n", pfx, mem->bank);
+               pr_debug("bank: %d\n", mem->bank);
        if (mem->validation_bits & CPER_MEM_VALID_DEVICE)
-               printk("%s""device: %d\n", pfx, mem->device);
+               pr_debug("device: %d\n", mem->device);
        if (mem->validation_bits & CPER_MEM_VALID_ROW)
-               printk("%s""row: %d\n", pfx, mem->row);
+               pr_debug("row: %d\n", mem->row);
        if (mem->validation_bits & CPER_MEM_VALID_COLUMN)
-               printk("%s""column: %d\n", pfx, mem->column);
+               pr_debug("column: %d\n", mem->column);
        if (mem->validation_bits & CPER_MEM_VALID_BIT_POSITION)
-               printk("%s""bit_position: %d\n", pfx, mem->bit_pos);
+               pr_debug("bit_position: %d\n", mem->bit_pos);
        if (mem->validation_bits & CPER_MEM_VALID_REQUESTOR_ID)
-               printk("%s""requestor_id: 0x%016llx\n", pfx, mem->requestor_id);
+               pr_debug("requestor_id: 0x%016llx\n", mem->requestor_id);
        if (mem->validation_bits & CPER_MEM_VALID_RESPONDER_ID)
-               printk("%s""responder_id: 0x%016llx\n", pfx, mem->responder_id);
+               pr_debug("responder_id: 0x%016llx\n", mem->responder_id);
        if (mem->validation_bits & CPER_MEM_VALID_TARGET_ID)
-               printk("%s""target_id: 0x%016llx\n", pfx, mem->target_id);
+               pr_debug("target_id: 0x%016llx\n", mem->target_id);
        if (mem->validation_bits & CPER_MEM_VALID_ERROR_TYPE) {
                u8 etype = mem->error_type;
                printk("%s""error_type: %d, %s\n", pfx, etype,
@@ -296,55 +297,45 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,
        pfx, pcie->bridge.secondary_status, pcie->bridge.control);
 }
 
-static const char * const cper_estatus_section_flag_strs[] = {
-       "primary",
-       "containment warning",
-       "reset",
-       "error threshold exceeded",
-       "resource not accessible",
-       "latent error",
-};
-
 static void cper_estatus_print_section(
        const char *pfx, const struct acpi_generic_data *gdata, int sec_no)
 {
        uuid_le *sec_type = (uuid_le *)gdata->section_type;
        __u16 severity;
+       char newpfx[64];
 
        severity = gdata->error_severity;
-       printk("%s""section: %d, severity: %d, %s\n", pfx, sec_no, severity,
+       printk("%s""Error %d, type: %s\n", pfx, sec_no,
               cper_severity_str(severity));
-       printk("%s""flags: 0x%02x\n", pfx, gdata->flags);
-       cper_print_bits(pfx, gdata->flags, cper_estatus_section_flag_strs,
-                       ARRAY_SIZE(cper_estatus_section_flag_strs));
        if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
                printk("%s""fru_id: %pUl\n", pfx, (uuid_le *)gdata->fru_id);
        if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
                printk("%s""fru_text: %.20s\n", pfx, gdata->fru_text);
 
+       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);
-               printk("%s""section_type: general processor error\n", pfx);
+               printk("%s""section_type: general processor error\n", newpfx);
                if (gdata->error_data_length >= sizeof(*proc_err))
-                       cper_print_proc_generic(pfx, 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);
-               printk("%s""section_type: memory error\n", pfx);
+               printk("%s""section_type: memory error\n", newpfx);
                if (gdata->error_data_length >= sizeof(*mem_err))
-                       cper_print_mem(pfx, mem_err);
+                       cper_print_mem(newpfx, mem_err);
                else
                        goto err_section_too_small;
        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) {
                struct cper_sec_pcie *pcie = (void *)(gdata + 1);
-               printk("%s""section_type: PCIe error\n", pfx);
+               printk("%s""section_type: PCIe error\n", newpfx);
                if (gdata->error_data_length >= sizeof(*pcie))
-                       cper_print_pcie(pfx, pcie, gdata);
+                       cper_print_pcie(newpfx, pcie, gdata);
                else
                        goto err_section_too_small;
        } else
-               printk("%s""section type: unknown, %pUl\n", pfx, sec_type);
+               printk("%s""section type: unknown, %pUl\n", newpfx, sec_type);
 
        return;
 
@@ -358,17 +349,21 @@ void cper_estatus_print(const char *pfx,
        struct acpi_generic_data *gdata;
        unsigned int data_len, gedata_len;
        int sec_no = 0;
+       char newpfx[64];
        __u16 severity;
 
-       printk("%s""Generic Hardware Error Status\n", pfx);
        severity = estatus->error_severity;
-       printk("%s""severity: %d, %s\n", pfx, severity,
-              cper_severity_str(severity));
+       if (severity == CPER_SEV_CORRECTED)
+               printk("%s%s\n", pfx,
+                      "It has been corrected by h/w "
+                      "and requires no further action");
+       printk("%s""event severity: %s\n", pfx, cper_severity_str(severity));
        data_len = estatus->data_length;
        gdata = (struct acpi_generic_data *)(estatus + 1);
+       snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP);
        while (data_len >= sizeof(*gdata)) {
                gedata_len = gdata->error_data_length;
-               cper_estatus_print_section(pfx, gdata, sec_no);
+               cper_estatus_print_section(newpfx, gdata, sec_no);
                data_len -= gedata_len + sizeof(*gdata);
                gdata = (void *)(gdata + 1) + gedata_len;
                sec_no++;