EDAC, mce_amd: Print ExtErrorCode and description on a single line

Save a log line by printing the extended error code and the description
on a single line. This is similar to how errors are printed in other
subsystems, e.g. "#, description". If we don't have a valid description
then only the number/code is printed.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190201225534.8177-6-Yazen.Ghannam@amd.com

diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 7e29ceabdf6f0322cd16a1464be40988509d071b..f286b880f9812bb3d0c13d11245d2aeb5926afd5 100644 (file)
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -965,13 +965,12 @@ static void decode_smca_error(struct mce *m)
 
        ip_name = smca_get_long_name(bank_type);
 
-       pr_emerg(HW_ERR "%s Extended Error Code: %d\n", ip_name, xec);
+       pr_emerg(HW_ERR "%s Ext. Error Code: %d", ip_name, xec);
 
        /* Only print the decode of valid error codes */
        if (xec < smca_mce_descs[bank_type].num_descs &&
                        (hwid->xec_bitmap & BIT_ULL(xec))) {
-               pr_emerg(HW_ERR "%s Error: ", ip_name);
-               pr_cont("%s.\n", smca_mce_descs[bank_type].descs[xec]);
+               pr_cont(", %s.\n", smca_mce_descs[bank_type].descs[xec]);
        }
 
        if (bank_type == SMCA_UMC && xec == 0 && decode_dram_ecc)