Messages in this thread Patch in this message | | | Date | Tue, 10 Dec 2019 10:07:03 -0000 | From | "tip-bot2 for Konstantin Khlebnikov" <> | Subject | [tip: ras/core] x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure() |
| |
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 17ba1939e3676417590ec6f7555608e137e1719a Gitweb: https://git.kernel.org/tip/17ba1939e3676417590ec6f7555608e137e1719a Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> AuthorDate: Thu, 31 Oct 2019 16:04:48 +03:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Mon, 09 Dec 2019 14:54:59 +01:00
x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure()
The function smca_configure() is called only on the current CPU therefore replace rdmsr_safe_on_cpu() with atomic rdmsr_safe() and avoid the IPI.
[ bp: Cleanup commit message. ]
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: linux-edac <linux-edac@vger.kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/157252708836.3876.4604398213417262402.stgit@buzz --- arch/x86/kernel/cpu/mce/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 5167bd2..e41e3b4 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -269,7 +269,7 @@ static void smca_configure(unsigned int bank, unsigned int cpu) if (smca_banks[bank].hwid) return; - if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) { + if (rdmsr_safe(MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) { pr_warn("Failed to read MCA_IPID for bank %d\n", bank); return; }
| |