x86/mce/amd, edac: Remove report_gart_errors

... because no one should be interested in spurious MCEs anyway. Make
the filtering unconditional and move it to amd_filter_mce().

Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20200407163414.18058-2-bp@alien8.de

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index f9cea081c05b016d185d4f5542b22a8aca323814..83b6ddafa032cf00d5147b724706d4a60ad08db9 100644 (file)
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -127,6 +127,8 @@
 #define MSR_AMD64_SMCA_MCx_DEADDR(x)   (MSR_AMD64_SMCA_MC0_DEADDR + 0x10*(x))
 #define MSR_AMD64_SMCA_MCx_MISCy(x, y) ((MSR_AMD64_SMCA_MC0_MISC1 + y) + (0x10*(x)))
 
+#define XEC(x, mask)                   (((x) >> 16) & mask)
+
 /*
  * This structure contains all data related to the MCE log.  Also
  * carries a signature to make it easier to find from external
@@ -347,5 +349,4 @@ umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr)      { return
 #endif
 
 static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c)       { return mce_amd_feature_init(c); }
-
 #endif /* _ASM_X86_MCE_H */

diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 15c87b87b901a1bb03627e853670fb8c5110b6fd..ea3cf714b7ad421345933c3155345b52636fa767 100644 (file)
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -577,14 +577,19 @@ bool amd_filter_mce(struct mce *m)
 {
        enum smca_bank_types bank_type = smca_get_bank_type(m->bank);
        struct cpuinfo_x86 *c = &boot_cpu_data;
-       u8 xec = (m->status >> 16) & 0x3F;
 
        /* See Family 17h Models 10h-2Fh Erratum #1114. */
        if (c->x86 == 0x17 &&
            c->x86_model >= 0x10 && c->x86_model <= 0x2F &&
-           bank_type == SMCA_IF && xec == 10)
+           bank_type == SMCA_IF && XEC(m->status, 0x3f) == 10)
                return true;
 
+       /* NB GART TLB error reporting is disabled by default. */
+       if (c->x86 < 0x17) {
+               if (m->bank == 4 && XEC(m->status, 0x1f) == 0x5)
+                       return true;
+       }
+
        return false;
 }
 

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index f91f3bc1e0b28b1095977ce3b27621e6fc08616f..6bdc5bb8c8bc972483c90d4e3be3d5f03aaaca24 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -4,9 +4,6 @@
 
 static struct edac_pci_ctl_info *pci_ctl;
 
-static int report_gart_errors;
-module_param(report_gart_errors, int, 0644);
-
 /*
  * Set by command line parameter. If BIOS has enabled the ECC, this override is
  * cleared to prevent re-enabling the hardware by this driver.
@@ -3681,9 +3678,6 @@ static int __init amd64_edac_init(void)
        }
 
        /* register stuff with EDAC MCE */
-       if (report_gart_errors)
-               amd_report_gart_errors(true);
-
        if (boot_cpu_data.x86 >= 0x17)
                amd_register_ecc_decoder(decode_umc_error);
        else
@@ -3718,8 +3712,6 @@ static void __exit amd64_edac_exit(void)
                edac_pci_release_generic_ctl(pci_ctl);
 
        /* unregister from EDAC MCE */
-       amd_report_gart_errors(false);
-
        if (boot_cpu_data.x86 >= 0x17)
                amd_unregister_ecc_decoder(decode_umc_error);
        else

diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 8874b7722b2f2608a9d22510d7777715f300fe1e..e58644d9c92b7f92f38e308cccc7359bf9f917c2 100644 (file)
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -10,15 +10,8 @@ static struct amd_decoder_ops fam_ops;
 
 static u8 xec_mask      = 0xf;
 
-static bool report_gart_errors;
 static void (*decode_dram_ecc)(int node_id, struct mce *m);
 
-void amd_report_gart_errors(bool v)
-{
-       report_gart_errors = v;
-}
-EXPORT_SYMBOL_GPL(amd_report_gart_errors);
-
 void amd_register_ecc_decoder(void (*f)(int, struct mce *))
 {
        decode_dram_ecc = f;
@@ -1030,20 +1023,6 @@ static inline void amd_decode_err_code(u16 ec)
        pr_cont("\n");
 }
 
-/*
- * Filter out unwanted MCE signatures here.
- */
-static bool ignore_mce(struct mce *m)
-{
-       /*
-        * NB GART TLB error reporting is disabled by default.
-        */
-       if (m->bank == 4 && XEC(m->status, 0x1f) == 0x5 && !report_gart_errors)
-               return true;
-
-       return false;
-}
-
 static const char *decode_error_status(struct mce *m)
 {
        if (m->status & MCI_STATUS_UC) {
@@ -1067,9 +1046,6 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
        unsigned int fam = x86_family(m->cpuid);
        int ecc;
 
-       if (ignore_mce(m))
-               return NOTIFY_STOP;
-
        pr_emerg(HW_ERR "%s\n", decode_error_status(m));
 
        pr_emerg(HW_ERR "CPU:%d (%x:%x:%x) MC%d_STATUS[%s|%s|%s|%s|%s",

diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
index 4e9c5e596c6c20890f1c40b997a2d4fbcf9f46b3..4811b18d9606bb5bf65eb51379dffcde280f0051 100644 (file)
--- a/drivers/edac/mce_amd.h
+++ b/drivers/edac/mce_amd.h
@@ -7,7 +7,6 @@
 #include <asm/mce.h>
 
 #define EC(x)                          ((x) & 0xffff)
-#define XEC(x, mask)                   (((x) >> 16) & mask)
 
 #define LOW_SYNDROME(x)                        (((x) >> 15) & 0xff)
 #define HIGH_SYNDROME(x)               (((x) >> 24) & 0xff)
@@ -77,7 +76,6 @@ struct amd_decoder_ops {
        bool (*mc2_mce)(u16, u8);
 };
 
-void amd_report_gart_errors(bool);
 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
 void amd_unregister_ecc_decoder(void (*f)(int, struct mce *));