Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[cascardo/linux.git] / drivers / edac / mce_amd.c

diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 99b3bf3..daaac2c 100644 (file)
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -859,6 +859,9 @@ static void decode_smca_errors(struct mce *m)
        if (m->bank >= ARRAY_SIZE(smca_banks))
                return;
 
+       if (boot_cpu_data.x86 >= 0x17 && m->bank == 4)
+               pr_emerg(HW_ERR "Bank 4 is reserved on Fam17h.\n");
+
        type = smca_banks[m->bank].type;
        if (!type)
                return;
@@ -984,6 +987,8 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
                if (m->status & MCI_STATUS_SYNDV)
                        pr_cont(", Syndrome: 0x%016llx", m->synd);
 
+               pr_cont(", IPID: 0x%016llx", m->ipid);
+
                pr_cont("\n");
 
                decode_smca_errors(m);