diff --git linux-libre-5.15.187-gnu/Makefile linux-libre-5.15.188-gnu/Makefile
index df5ba6761d47..3d758082dd36 100644
--- linux-libre-5.15.187-gnu/Makefile
+++ linux-libre-5.15.188-gnu/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 15
-SUBLEVEL = 187
+SUBLEVEL = 188
 EXTRAVERSION = -gnu
 NAME = Trick or Treat
 
diff --git linux-libre-5.15.187-gnu/arch/x86/kernel/cpu/amd.c linux-libre-5.15.188-gnu/arch/x86/kernel/cpu/amd.c
index 91598371833d..f008a2c2e717 100644
--- linux-libre-5.15.187-gnu/arch/x86/kernel/cpu/amd.c
+++ linux-libre-5.15.188-gnu/arch/x86/kernel/cpu/amd.c
@@ -590,6 +590,7 @@ static bool amd_check_tsa_microcode(void)
 
 	p.ext_fam	= c->x86 - 0xf;
 	p.model		= c->x86_model;
+	p.ext_model	= c->x86_model >> 4;
 	p.stepping	= c->x86_stepping;
 
 	if (c->x86 == 0x19) {
@@ -704,6 +705,8 @@ static void bsp_init_amd(struct cpuinfo_x86 *c)
 	}
 
 	resctrl_cpu_detect(c);
+
+	tsa_init(c);
 }
 
 static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
@@ -743,8 +746,6 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
 			goto clear_sev;
 
 
-	tsa_init(c);
-
 		return;
 
 clear_all:
