x86, MCE, FIX MSR_IA32_MCI_CTL2_CMCI threshold setup
cover x86, MCE, FIX MSR_IA32_MCI_CTL2_CMCI threshold setup
Changelog:
v3:
- Separate patch into 2 patches, one for renaming, the other for threshold setup fixing.
v2:
- Rename CMCI_EN to MCI_CTL2_CMCI_EN and CMCI_THRESHOLD_MASK to MCI_CTL2_CMCI_THRESHOLD_MASK to make naming consistent.
PATCH 1/2 x86, MCE, rename MSR_IA32_MCx_CTL2 value
Rename CMCI_EN to MCI_CTL2_CMCI_EN and CMCI_THRESHOLD_MASK to MCI_CTL2_CMCI_THRESHOLD_MASK to make naming consistent.
--- arch/x86/include/asm/mce.h | 4 ++++ arch/x86/include/asm/msr-index.h | 3 --- arch/x86/kernel/cpu/mcheck/mce_intel.c | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-)
arch/x86/include/asm/mce.h +4 -0
@@ -38,6 +38,10 @@#define MCM_ADDR_MEM 3/* memory address */ #define MCM_ADDR_GENERIC 7/* generic */ +/* CTL2 register defines */ +#define MCI_CTL2_CMCI_EN (1ULL << 30) +#define MCI_CTL2_CMCI_THRESHOLD_MASK 0xffffULL +#define MCJ_CTX_MASK 3#define MCJ_CTX (flags) ((flags) & MCJ_CTX_MASK)#define MCJ_CTX_RANDOM 0/* inject context: random */
arch/x86/include/asm/msr-index.h +0 -3
@@ -91,9 +91,6 @@#define MSR_IA32_MC0_CTL2 0x00000280#define MSR_IA32_MCx_CTL2 (x) (MSR_IA32_MC0_CTL2 + (x)) -#define CMCI_EN (1ULL << 30) -#define CMCI_THRESHOLD_MASK 0xffffULL -#define MSR_P6_PERFCTR0 0x000000c1#define MSR_P6_PERFCTR1 0x000000c2#define MSR_P6_EVNTSEL0 0x00000186
arch/x86/kernel/cpu/mcheck/mce_intel.c +4 -4
@@ -95,19 +95,19 @@ static void cmci_discover(int banks, intrdmsrl (MSR_IA32_MCx_CTL2 (i), val);/* Already owned by someone else? */ -if (val &CMCI_EN ) { +if (val &MCI_CTL2_CMCI_EN ) {if (test_and_clear_bit (i, owned) && !boot)print_update ("SHD" , &hdr, i);__clear_bit (i,__get_cpu_var (mce_poll_banks));continue ; } - val |=CMCI_EN |CMCI_THRESHOLD ; + val |=MCI_CTL2_CMCI_EN |CMCI_THRESHOLD ;wrmsrl (MSR_IA32_MCx_CTL2 (i), val);rdmsrl (MSR_IA32_MCx_CTL2 (i), val);/* Did the enable bit stick? -- the bank supports CMCI */ -if (val &CMCI_EN ) { +if (val &MCI_CTL2_CMCI_EN ) {if (!test_and_set_bit (i, owned) && !boot)print_update ("CMCI" , &hdr, i);__clear_bit (i,__get_cpu_var (mce_poll_banks));
@@ -155,7 +155,7 @@ void cmci_clear(void)continue ;/* Disable CMCI */ rdmsrl (MSR_IA32_MCx_CTL2 (i), val); - val &= ~(CMCI_EN |CMCI_THRESHOLD_MASK ); + val &= ~(MCI_CTL2_CMCI_EN |MCI_CTL2_CMCI_THRESHOLD_MASK );wrmsrl (MSR_IA32_MCx_CTL2 (i), val);__clear_bit (i,__get_cpu_var (mce_banks_owned)); }
PATCH 2/2 x86, MCE, fix MSR_IA32_MCI_CTL2 CMCI threshold setup
In reply to Huang YingIt is reported that CMCI is not raised when number of corrected error reaches preset threshold. After inspection, it is found that MSR_IA32_MCI_CTL2 threshold field is not setup properly. This patch fixed it.
Value of MCI_CTL2_CMCI_THRESHOLD_MASK is fixed according to x86_64 Software Developer's Manual too.
--- arch/x86/include/asm/mce.h | 2 +- arch/x86/kernel/cpu/mcheck/mce_intel.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
arch/x86/include/asm/mce.h +1 -1
@@ -40,7 +40,7 @@/* CTL2 register defines */ #define MCI_CTL2_CMCI_EN (1ULL << 30) -#define MCI_CTL2_CMCI_THRESHOLD_MASK 0xffffULL +#define MCI_CTL2_CMCI_THRESHOLD_MASK 0x7fffULL#define MCJ_CTX_MASK 3#define MCJ_CTX (flags) ((flags) & MCJ_CTX_MASK)
arch/x86/kernel/cpu/mcheck/mce_intel.c +1 -0
@@ -102,6 +102,7 @@ static void cmci_discover(int banks, intcontinue ; } + val &= ~MCI_CTL2_CMCI_THRESHOLD_MASK ; val |=MCI_CTL2_CMCI_EN |CMCI_THRESHOLD ;wrmsrl (MSR_IA32_MCx_CTL2 (i), val);rdmsrl (MSR_IA32_MCx_CTL2 (i), val);