RAS urgent for 5.5
Subsystems (3)
Hi Linus,
please pull 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.
Thx.
---
The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a:
Linux 5.5-rc1 (2019-12-08 14:57:55 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-urgent-for-linus
for you to fetch changes up to a3a57ddad061acc90bef39635caf2b2330ce8f21:
x86/mce: Fix possibly incorrect severity calculation on AMD (2019-12-17 09:39:53 +0100)
----------------------------------------------------------------
Jan H. Schönherr (1):
x86/mce: Fix possibly incorrect severity calculation on AMD
Konstantin Khlebnikov (1):
x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure()
Yazen Ghannam (1):
x86/MCE/AMD: Allow Reserved types to be overwritten in smca_banks[]
arch/x86/kernel/cpu/mce/amd.c | 4 ++-- arch/x86/kernel/cpu/mce/core.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mce/amd.c +2 -2
@@ -266,10 +266,10 @@ static void smca_configure(unsigned int bank, unsigned int cpu)smca_set_misc_banks_map (bank, cpu);/* Return early if this bank was already initialized. */ -if (smca_banks[bank].hwid) +if (smca_banks[bank].hwid && smca_banks[bank].hwid->hwid_mcatype !=0 )return ; -if (rdmsr_safe_on_cpu (cpu,MSR_AMD64_SMCA_MCx_IPID (bank), &low, &high)) { +if (rdmsr_safe (MSR_AMD64_SMCA_MCx_IPID (bank), &low, &high)) {pr_warn ("Failed to read MCA_IPID for bank %d\n" , bank);return ; }
arch/x86/kernel/cpu/mce/core.c +1 -1
@@ -819,8 +819,8 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp,if (quirk_no_way_out)quirk_no_way_out (i, m, regs); + m->bank = i;if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { - m->bank = i;mce_read_aux (m, i); *msg = tmp;return 1 ;
Signature · 4 lines
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG NürnbergThe pull request you sent on Sat, 21 Dec 2019 10:23:53 +0100:
The pull request you sent on Sat, 21 Dec 2019 10:23:53 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitras-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5c741e2583d2e5a3fc148a5e8a2464bbaa45a1d9
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker