tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 RAS fixes from Borislav Petkov:
"Three urgent RAS fixes for the AMD side of things:

- initialize struct mce.bank so that calculated error severity on AMD
SMCA machines is correct

- do not send IPIs early during bank initialization, when interrupts
are disabled

- a fix for when only a subset of MCA banks are enabled, which led to
boot hangs on some new AMD CPUs"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Fix possibly incorrect severity calculation on AMD
x86/MCE/AMD: Allow Reserved types to be overwritten in smca_banks[]
x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure()

Linus Torvalds 5c741e25 12ac9a08

+3 -3
+2 -2
arch/x86/kernel/cpu/mce/amd.c
··· 266 266 smca_set_misc_banks_map(bank, cpu); 267 267 268 268 /* Return early if this bank was already initialized. */ 269 - if (smca_banks[bank].hwid) 269 + if (smca_banks[bank].hwid && smca_banks[bank].hwid->hwid_mcatype != 0) 270 270 return; 271 271 272 - if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) { 272 + if (rdmsr_safe(MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) { 273 273 pr_warn("Failed to read MCA_IPID for bank %d\n", bank); 274 274 return; 275 275 }
+1 -1
arch/x86/kernel/cpu/mce/core.c
··· 819 819 if (quirk_no_way_out) 820 820 quirk_no_way_out(i, m, regs); 821 821 822 + m->bank = i; 822 823 if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) { 823 - m->bank = i; 824 824 mce_read_aux(m, i); 825 825 *msg = tmp; 826 826 return 1;