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

Zhenzhong Duan · gregkh · commit 40f981691bdf · 2020-08-19T08:14:47.000+02:00
[ Upstream commit 5d7f7d1 ] The original code is a nop as i_mce.status is or'ed with part of itself, fix it. Fixes: a1300e5 ("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>
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -518,7 +518,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;
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ static void do_inject(void)`
`518`	`518`	`*/`
`519`	`519`	`if (inj_type == DFR_INT_INJ) {`
`520`	`520`	`i_mce.status \|= MCI_STATUS_DEFERRED;`
`521`		`- i_mce.status \|= (i_mce.status & ~MCI_STATUS_UC);`
	`521`	`+ i_mce.status &= ~MCI_STATUS_UC;`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`/*`