Commit bb91f8c0 authored Apr 30, 2016 by Aravind Gopalakrishnan Committed by Ingo Molnar May 03, 2016

x86/mce: Carve out writes to MCx_STATUS and MCx_CTL



We need to do this after __mcheck_cpu_init_vendor() as for
ScalableMCA processors, there are going to be new MSR write handlers
if the feature is detected using CPUID bit (which happens in
__mcheck_cpu_init_vendor()).

No functional change is introduced here.

Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Aravind Gopalakrishnan <aravindksg.lkml@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1462019637-16474-4-git-send-email-bp@alien8.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 6bda529e

arch/x86/kernel/cpu/mcheck/mce.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -1420,7 +1420,6 @@ static void __mcheck_cpu_init_generic(void)
		enum mcp_flags m_fl = 0;
		mce_banks_t all_banks;
		u64 cap;
		int i;

		if (!mca_cfg.bootlog)
		m_fl = MCP_DONTLOG;
		@@ -1436,6 +1435,11 @@ static void __mcheck_cpu_init_generic(void)
		rdmsrl(MSR_IA32_MCG_CAP, cap);
		if (cap & MCG_CTL_P)
		wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff);
		}

		static void __mcheck_cpu_init_clear_banks(void)
		{
		int i;

		for (i = 0; i < mca_cfg.banks; i++) {
		struct mce_bank *b = &mce_banks[i];
		@@ -1717,6 +1721,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)

		__mcheck_cpu_init_generic();
		__mcheck_cpu_init_vendor(c);
		__mcheck_cpu_init_clear_banks();
		__mcheck_cpu_init_timer();
		}

		@@ -2121,6 +2126,7 @@ static void mce_syscore_resume(void)
		{
		__mcheck_cpu_init_generic();
		__mcheck_cpu_init_vendor(raw_cpu_ptr(&cpu_info));
		__mcheck_cpu_init_clear_banks();
		}

		static struct syscore_ops mce_syscore_ops = {
		@@ -2138,6 +2144,7 @@ static void mce_cpu_restart(void *data)
		if (!mce_available(raw_cpu_ptr(&cpu_info)))
		return;
		__mcheck_cpu_init_generic();
		__mcheck_cpu_init_clear_banks();
		__mcheck_cpu_init_timer();
		}