Merge tag 'x86-urgent-2026-01-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 71b62ed6cea9 · 2026-01-02T12:04:51.000-08:00
Pull x86 fix from Ingo Molnar:
 "Fix the AMD microcode Entrysign signature checking code to include
  more models"

* tag 'x86-urgent-2026-01-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode/AMD: Fix Entrysign revision check for Zen5/Strix Halo
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
@@ -258,7 +258,7 @@ static bool cpu_has_entrysign(void)
 	if (fam == 0x1a) {
 		if (model <= 0x2f ||
 		    (0x40 <= model && model <= 0x4f) ||
-		    (0x60 <= model && model <= 0x6f))
+		    (0x60 <= model && model <= 0x7f))
 			return true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ static bool cpu_has_entrysign(void)`
`258`	`258`	`if (fam == 0x1a) {`
`259`	`259`	`if (model <= 0x2f \|\|`
`260`	`260`	`(0x40 <= model && model <= 0x4f) \|\|`
`261`		`- (0x60 <= model && model <= 0x6f))`
	`261`	`+ (0x60 <= model && model <= 0x7f))`
`262`	`262`	`return true;`
`263`	`263`	`}`
`264`	`264`