Commit d7135812 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ras-urgent-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 MCE fix from Ingo Molnar:
 "Fix incorrect hardware errors reported on Zen3 CPUs, such as bogus
  L3 cache deferred errors (Yazen Ghannam)"

* tag 'ras-urgent-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce/amd: Filter bogus hardware errors on Zen3 clients
parents c919577e 0422b07b

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

+8 −0
Original line number Diff line number Diff line
@@ -604,6 +604,14 @@ bool amd_filter_mce(struct mce *m) 
	enum smca_bank_types bank_type = smca_get_bank_type(m->extcpu, m->bank);

	struct cpuinfo_x86 *c = &boot_cpu_data;



	/* Bogus hw errors on Cezanne A0. */

	if (c->x86 == 0x19 &&

	    c->x86_model == 0x50 &&

	    c->x86_stepping == 0x0) {

		if (!(m->status & MCI_STATUS_EN))

			return true;

	}



	/* See Family 17h Models 10h-2Fh Erratum #1114. */

	if (c->x86 == 0x17 &&

	    c->x86_model >= 0x10 && c->x86_model <= 0x2F &&