From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbdFMQan (ORCPT ); Tue, 13 Jun 2017 12:30:43 -0400 Received: from mail.skyhub.de ([5.9.137.197]:35104 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189AbdFMQ2y (ORCPT ); Tue, 13 Jun 2017 12:28:54 -0400 From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 1/8] x86/mce/AMD: Use msr_stat when clearing MCA_STATUS Date: Tue, 13 Jun 2017 18:28:28 +0200 Message-Id: <20170613162835.30750-2-bp@alien8.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170613162835.30750-1-bp@alien8.de> References: <20170613162835.30750-1-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam The value of MCA_STATUS is used as the MSR when clearing MCA_STATUS. This may cause the following warning: unchecked MSR access error: WRMSR to 0x11b (tried to write 0x0000000000000000) Call Trace: ? amd_threshold_interrupt+0x209/0x220 smp_threshold_interrupt+0x1b/0x40 threshold_interrupt+0x89/0x90 Use msr_stat instead which has the MSR address. Fixes: 37d43acfd79f ("x86/mce/AMD: Redo error logging from APIC LVT interrupt handlers") Signed-off-by: Yazen Ghannam Cc: Tony Luck Cc: linux-edac Cc: x86-ml Link: http://lkml.kernel.org/r/1495658507-7413-1-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index d00f299f2ada..d11f94e8e68a 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -815,7 +815,7 @@ _log_error_bank(unsigned int bank, u32 msr_stat, u32 msr_addr, u64 misc) __log_error(bank, status, addr, misc); - wrmsrl(status, 0); + wrmsrl(msr_stat, 0); return status & MCI_STATUS_DEFERRED; } -- 2.13.0