Commit 2976908e authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Borislav Petkov

x86/mce: Do not log spurious corrected mce errors

A user has reported that they are seeing spurious corrected errors on
their hardware.

Intel Errata HSD131, HSM142, HSW131, and BDM48 report that "spurious
corrected errors may be logged in the IA32_MC0_STATUS register with
the valid field (bit 63) set, the uncorrected error field (bit 61) not
set, a Model Specific Error Code (bits [31:16]) of 0x000F, and an MCA
Error Code (bits [15:0]) of 0x0005." The Errata PDFs are linked in the
bugzilla below.

Block these spurious errors from the console and logs.

 [ bp: Move the intel_filter_mce() header declarations into the already
   existing CONFIG_X86_MCE_INTEL ifdeffery. ]
Co-developed-by: default avatarAlexander Krupp <centos@akr.yagii.de>
Signed-off-by: default avatarAlexander Krupp <centos@akr.yagii.de>
Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=206587
Link: https://lkml.kernel.org/r/20200219131611.36816-1-prarit@redhat.com
parent 11a48a5a
...@@ -1877,6 +1877,8 @@ bool filter_mce(struct mce *m) ...@@ -1877,6 +1877,8 @@ bool filter_mce(struct mce *m)
{ {
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
return amd_filter_mce(m); return amd_filter_mce(m);
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
return intel_filter_mce(m);
return false; return false;
} }
......
...@@ -520,3 +520,20 @@ void mce_intel_feature_clear(struct cpuinfo_x86 *c) ...@@ -520,3 +520,20 @@ void mce_intel_feature_clear(struct cpuinfo_x86 *c)
{ {
intel_clear_lmce(); intel_clear_lmce();
} }
bool intel_filter_mce(struct mce *m)
{
struct cpuinfo_x86 *c = &boot_cpu_data;
/* MCE errata HSD131, HSM142, HSW131, BDM48, and HSM142 */
if ((c->x86 == 6) &&
((c->x86_model == INTEL_FAM6_HASWELL) ||
(c->x86_model == INTEL_FAM6_HASWELL_L) ||
(c->x86_model == INTEL_FAM6_BROADWELL) ||
(c->x86_model == INTEL_FAM6_HASWELL_G)) &&
(m->bank == 0) &&
((m->status & 0xa0000000ffffffff) == 0x80000000000f0005))
return true;
return false;
}
...@@ -48,6 +48,7 @@ void cmci_disable_bank(int bank); ...@@ -48,6 +48,7 @@ void cmci_disable_bank(int bank);
void intel_init_cmci(void); void intel_init_cmci(void);
void intel_init_lmce(void); void intel_init_lmce(void);
void intel_clear_lmce(void); void intel_clear_lmce(void);
bool intel_filter_mce(struct mce *m);
#else #else
# define cmci_intel_adjust_timer mce_adjust_timer_default # define cmci_intel_adjust_timer mce_adjust_timer_default
static inline bool mce_intel_cmci_poll(void) { return false; } static inline bool mce_intel_cmci_poll(void) { return false; }
...@@ -56,6 +57,7 @@ static inline void cmci_disable_bank(int bank) { } ...@@ -56,6 +57,7 @@ static inline void cmci_disable_bank(int bank) { }
static inline void intel_init_cmci(void) { } static inline void intel_init_cmci(void) { }
static inline void intel_init_lmce(void) { } static inline void intel_init_lmce(void) { }
static inline void intel_clear_lmce(void) { } static inline void intel_clear_lmce(void) { }
static inline bool intel_filter_mce(struct mce *m) { return false; };
#endif #endif
void mce_timer_kick(unsigned long interval); void mce_timer_kick(unsigned long interval);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment