x86, mce: Remove unused declarations
PATCH 1/2 x86, mce: Remove unused declarations
Remove unused references
Signed-off-by Ashok Raj <[email protected]>
--- arch/x86/include/asm/mce.h | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/include/asm/mce.h +0 -4
@@ -174,16 +174,12 @@ void cmci_clear(void);void cmci_reenable (void );void cmci_rediscover (void );void cmci_recheck (void ); -void lmce_clear (void ); -void lmce_enable (void );#else static inline void mce_intel_feature_init (struct cpuinfo_x86 *c) { }static inline void cmci_clear (void ) {}static inline void cmci_reenable (void ) {}static inline void cmci_rediscover (void ) {}static inline void cmci_recheck (void ) {} -static inline void lmce_clear (void ) {} -static inline void lmce_enable (void ) {}#endif #ifdef CONFIG_X86_MCE_AMD
Signature · 1 line
2.4.3
PATCH 2/2 x86, mce: clear Local MCE opt-in before kexec.
kexec could boot a kernel that could be legacy with no knowledge of LMCE. hence we should make sure we clear LMCE optin before kexec reboot.
Signed-off-by Ashok Raj <[email protected]>
--- arch/x86/include/asm/mce.h | 4 ++++ arch/x86/kernel/cpu/mcheck/mce.c | 30 ++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/mcheck/mce_intel.c | 19 ++++++++++++++++++- arch/x86/kernel/process.c | 2 ++ arch/x86/kernel/smp.c | 2 ++ 5 files changed, 56 insertions(+), 1 deletion(-)
arch/x86/include/asm/mce.h +4 -0
@@ -140,10 +140,12 @@ extern int mce_p5_enabled;#ifdef CONFIG_X86_MCE int mcheck_init (void );void mcheck_cpu_init (struct cpuinfo_x86 *c); +void mcheck_cpu_clear (struct cpuinfo_x86 *c);void mcheck_vendor_init_severity (void );#else static inline int mcheck_init (void ) {return 0 ; }static inline void mcheck_cpu_init (struct cpuinfo_x86 *c) {} +static inline void mcheck_cpu_clear (struct cpuinfo_x86 *c) {}static inline void mcheck_vendor_init_severity (void ) {}#endif
@@ -170,12 +172,14 @@ DECLARE_PER_CPU(struct device *, mce_device);#ifdef CONFIG_X86_MCE_INTEL void mce_intel_feature_init (struct cpuinfo_x86 *c); +void mce_intel_feature_clear (struct cpuinfo_x86 *c);void cmci_clear (void );void cmci_reenable (void );void cmci_rediscover (void );void cmci_recheck (void );#else static inline void mce_intel_feature_init (struct cpuinfo_x86 *c) { } +static inline void mce_intel_feature_clear (struct cpuinfo_x86 *c) { }static inline void cmci_clear (void ) {}static inline void cmci_reenable (void ) {}static inline void cmci_rediscover (void ) {}
arch/x86/kernel/cpu/mcheck/mce.c +30 -0
@@ -1669,6 +1669,17 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) } } +static void __mcheck_cpu_clear_vendor (struct cpuinfo_x86 *c) +{ +switch (c->x86_vendor) { +case X86_VENDOR_INTEL : +mce_intel_feature_clear (c); +break ; +default : +break ; + } +} +static void mce_start_timer (unsigned int cpu,struct timer_list *t) {unsigned long iv = check_interval *HZ ;
@@ -1732,6 +1743,25 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) }/* +* Called for each booted CPU to clear some machine checks opt-ins +*/ +void mcheck_cpu_clear (struct cpuinfo_x86 *c) +{ +if (mca_cfg.disabled) +return ; + +if (!mce_available (c)) +return ; + +/* +* Possibly to clear general settings generic to x86 +* __mcheck_cpu_clear_generic(c); +*/ +__mcheck_cpu_clear_vendor (c); + +} + +/* * mce_chrdev: Character device /dev/mcelog to read and clear the MCE log. */
arch/x86/kernel/cpu/mcheck/mce_intel.c +18 -1
@@ -435,7 +435,7 @@ static void intel_init_cmci(void)cmci_recheck (); } -void intel_init_lmce (void ) +static void intel_init_lmce (void ) {u64 val;
@@ -448,9 +448,26 @@ void intel_init_lmce(void)wrmsrl (MSR_IA32_MCG_EXT_CTL , val |MCG_EXT_CTL_LMCE_EN ); } +static void intel_clear_lmce (void ) +{ +u64 val; + +if (!lmce_supported ()) +return ; + +rdmsrl (MSR_IA32_MCG_EXT_CTL , val); + val &= ~MCG_EXT_CTL_LMCE_EN ; +wrmsrl (MSR_IA32_MCG_EXT_CTL , val); +} +void mce_intel_feature_init (struct cpuinfo_x86 *c) {intel_init_thermal (c);intel_init_cmci ();intel_init_lmce (); } + +void mce_intel_feature_clear (struct cpuinfo_x86 *c) +{ +intel_clear_lmce (); +}
arch/x86/kernel/process.c +2 -0
@@ -30,6 +30,7 @@#include <asm/debugreg.h> #include <asm/nmi.h> #include <asm/tlbflush.h> +#include <asm/mce.h> /* * per-CPU TSS segments. Threads are completely 'soft' on Linux,
@@ -363,6 +364,7 @@ void stop_this_cpu(void *dummy)*/ set_cpu_online (smp_processor_id (), false);disable_local_APIC (); +mcheck_cpu_clear (this_cpu_ptr (&cpu_info));for (;;)halt ();
arch/x86/kernel/smp.c +2 -0
@@ -30,6 +30,7 @@#include <asm/proto.h> #include <asm/apic.h> #include <asm/nmi.h> +#include <asm/mce.h> #include <asm/trace/irq_vectors.h> /* * Some notes on x86 processor bugs affecting SMP operation:
@@ -244,6 +245,7 @@ static void native_stop_other_cpus(int wait) finish:local_irq_save (flags);disable_local_APIC (); +mcheck_cpu_clear (this_cpu_ptr (&cpu_info));local_irq_restore (flags); }
Signature · 1 line
2.4.3
Borislav Petkov
maintainerRe: [Patch V1 2/2] x86, mce: clear Local MCE opt-in before kexec.
Quoted 11 lines · Ashok Raj
kexec could boot a kernel that could be legacy with no knowledge of LMCE. hence we should make sure we clear LMCE optin before kexec reboot.
Signed-off-by Ashok Raj <[email protected]>--- arch/x86/include/asm/mce.h | 4 ++++ arch/x86/kernel/cpu/mcheck/mce.c | 30 ++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/mcheck/mce_intel.c | 19 ++++++++++++++++++- arch/x86/kernel/process.c | 2 ++ arch/x86/kernel/smp.c | 2 ++ 5 files changed, 56 insertions(+), 1 deletion(-)
No complaints, looks ok to me. Applied, thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--Quoted 18 lines · Ashok Raj
Remove unused references
Signed-off-by Ashok Raj <[email protected]>--- arch/x86/include/asm/mce.h | 4 ---- 1 file changed, 4 deletions(-)arch/x86/include/asm/mce.h +0
-2@@ -174,16 +174,12 @@ void cmci_clear(void);void cmci_reenable (void );void cmci_rediscover (void );void cmci_recheck (void ); -void lmce_clear (void ); -void lmce_enable (void );#else
arch/x86/include/asm/mce.h void cmci_clear(void); · line 185
Quoted 10 lines
arch/x86/include/asm/mce.h +0
-2static inline void mce_intel_feature_init (struct cpuinfo_x86 *c) { }static inline void cmci_clear (void ) {}static inline void cmci_reenable (void ) {}static inline void cmci_rediscover (void ) {}static inline void cmci_recheck (void ) {} -static inline void lmce_clear (void ) {} -static inline void lmce_enable (void ) {}#endif #ifdef CONFIG_X86_MCE_AMD
Applied, thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--