Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (5c741e25) · Commits · 戴 / test

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()

arch/x86/kernel/cpu/mce/amd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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);

		if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) {
		m->bank = i;
		if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) {
		mce_read_aux(m, i);
		*msg = tmp;
		return 1;

Admin message