Skip to content

Commit c8a4364

Browse files
yghannamKAGA-KOKO
authored andcommitted
x86/mce/AMD: Don't set DEF_INT_TYPE in MSR_CU_DEF_ERR on SMCA systems
The McaIntrCfg register (MSRC000_0410), previously known as CU_DEFER_ERR, is used on SMCA systems to set the LVT offset for the Threshold and Deferred error interrupts. This register was used on non-SMCA systems to also set the Deferred interrupt type in bits 2:1. However, these bits are reserved on SMCA systems. Only set MSRC000_0410[2:1] on non-SMCA systems. Signed-off-by: Yazen Ghannam <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Tony Luck <[email protected]> Cc: linux-edac <[email protected]> Link: http://lkml.kernel.org/r/[email protected]
1 parent e085ac7 commit c8a4364

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ static void deferred_error_interrupt_enable(struct cpuinfo_x86 *c)
407407
(deferred_error_int_vector != amd_deferred_error_interrupt))
408408
deferred_error_int_vector = amd_deferred_error_interrupt;
409409

410-
low = (low & ~MASK_DEF_INT_TYPE) | DEF_INT_TYPE_APIC;
410+
if (!mce_flags.smca)
411+
low = (low & ~MASK_DEF_INT_TYPE) | DEF_INT_TYPE_APIC;
412+
411413
wrmsr(MSR_CU_DEF_ERR, low, high);
412414
}
413415

0 commit comments

Comments
 (0)