x86/mce/inject: Fix a wrong assignment of i_mce.status

BugLink: https://bugs.launchpad.net/bugs/1892417
[ Upstream commit 5d7f7d1d5e01c22894dee7c9c9266500478dca99 ]

The original code is a nop as i_mce.status is or'ed with part of itself,
fix it.

Fixes: a1300e505297 ("x86/ras/mce_amd_inj: Trigger deferred and thresholding errors interrupts")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lkml.kernel.org/r/20200611023238.3830-1-zhenzhong.duan@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
index 1f30117b24ba7af6220fb8a5001f46b9a536a7db..eb2d41c1816d66b87939069f6eae9832b4bc6fa0 100644 (file)
--- a/arch/x86/kernel/cpu/mce/inject.c
+++ b/arch/x86/kernel/cpu/mce/inject.c
@@ -511,7 +511,7 @@ static void do_inject(void)
         */
        if (inj_type == DFR_INT_INJ) {
                i_mce.status |= MCI_STATUS_DEFERRED;
-               i_mce.status |= (i_mce.status & ~MCI_STATUS_UC);
+               i_mce.status &= ~MCI_STATUS_UC;
        }
 
        /*