2 files changed, 6 insertions, 1 deletions

diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c
index ff8eb1a9ce6d..f4b442cc8a3e 100644
--- a/arch/x86/ras/mce_amd_inj.c
+++ b/arch/x86/ras/mce_amd_inj.c
@@ -308,7 +308,9 @@ static void do_inject(void)
          * only on the node base core. Refer to D18F3x44[NbMcaToMstCpuEn] for
          * Fam10h and later BKDGs.
          */
-        if (static_cpu_has(X86_FEATURE_AMD_DCM) && b == 4) {
+        if (static_cpu_has(X86_FEATURE_AMD_DCM) &&
+            b == 4 &&
+            boot_cpu_data.x86 < 0x17) {
                 toggle_nb_mca_mst_cpu(amd_get_nb_id(cpu));
                 cpu = get_nbc_for_node(amd_get_nb_id(cpu));
         }
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index e8855a4f92d9..daaac2c79ca7 100644
--- 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;