EDAC, mce_amd: Don't report poison bit on Fam15h, bank 4

MCA_STATUS[43] has been defined as "Poison" or "Reserved" for every bank
since Fam15h except for Fam15h, bank 4 in which case it's defined as
part of the McaStatSubCache bitfield.

Filter out that case.

Reported-by: Dean Liberty <Dean.Liberty@amd.com>
Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
Cc: Aravind Gopalakrishnan <aravindksg.lkml@gmail.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/1479478222-19896-1-git-send-email-Yazen.Ghannam@amd.com
[ Split an almost unparseable ternary conditional, add a comment. ]
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index ba2995c..34208f3 100644 (file)
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -964,10 +964,13 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
                ((m->status & MCI_STATUS_PCC)   ? "PCC"   : "-"),
                ((m->status & MCI_STATUS_ADDRV) ? "AddrV" : "-"));
 
-       if (c->x86 >= 0x15)
-               pr_cont("|%s|%s",
-                       ((m->status & MCI_STATUS_DEFERRED) ? "Deferred" : "-"),
-                       ((m->status & MCI_STATUS_POISON)   ? "Poison"   : "-"));
+       if (c->x86 >= 0x15) {
+               pr_cont("|%s", (m->status & MCI_STATUS_DEFERRED ? "Deferred" : "-"));
+
+               /* F15h, bank4, bit 43 is part of McaStatSubCache. */
+               if (c->x86 != 0x15 || m->bank != 4)
+                       pr_cont("|%s", (m->status & MCI_STATUS_POISON ? "Poison" : "-"));
+       }
 
        if (boot_cpu_has(X86_FEATURE_SMCA)) {
                u32 low, high;