Skip to content

Commit 68203e9

Browse files
committed
Merge tag 'v6.1.145' into 6.1-main
This is the 6.1.145 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmh1DIcACgkQONu9yGCS # aT7s3RAAiWgX3F34vwQVgFZ9E1Np1c9SJw9UJkCR10LCNg+wp8b3vCOrUNAeN49M # IzR864I+KEp2h4xZSVewdhNZp1V9eHCMbqPEFOzPu7ZKqViXKO36HQ8AdOXkH8yt # 1a28QIezHhEitl0T9o13xtjBzQfJiAI39g6THE2lk1bXBPx/j8DA2QoC/2oEp1bT # 6TNEaV06JX+7dhSt+bVxgbeI2cIXv19bnS/PUN5CGaWyUCptfYDQERMIMA0ifIiQ # Ivh/ZktT6N2Lhd+24YxiO0U8q0kmm0RY+8RUeYXU1VcV39OJG2ABVSFSuANswkxh # EgJH9WGIDcnGxh/xV9+WNtuOmjerUV8Y8FRJbRmtnhU8eDBBIBJU0ajO7nx+9/eQ # 1zkog5X4g3AkiiXEn4SY4OfYp0uLJvD20HDjjAo1J05B8V2OG1x+GeAhgVV2OwZs # gtYQErZtd5MZS19f48vJhKpDd/Ez10wBFW04Y+7Z69vzeV2qV1pBlY5sG6zjeWpM # IOxK1Ha7wvflNgrvyRAPi/u0v1tMvkN2/D2pW7unTwNE/iXh6G4BMJRVTpcp8vr8 # +gFocyMoppF/8O96Cx+9sLhwP2cK8wXu7mkvLJnoGavT95E4eXsewHubnDwtuXiW # vLDGWZn2ncxT3LZ0/Txb/OZWfKZ69QT1Q3UG5qI10tUVXSLUICg= # =ygiu # -----END PGP SIGNATURE----- # gpg: Signature made Mon Jul 14 15:56:23 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents cbfab53 + f2198ea commit 68203e9

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 144
4+
SUBLEVEL = 145
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

arch/x86/kernel/cpu/amd.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ static bool amd_check_tsa_microcode(void)
561561

562562
p.ext_fam = c->x86 - 0xf;
563563
p.model = c->x86_model;
564+
p.ext_model = c->x86_model >> 4;
564565
p.stepping = c->x86_stepping;
565566

566567
if (c->x86 == 0x19) {
@@ -675,6 +676,8 @@ static void bsp_init_amd(struct cpuinfo_x86 *c)
675676
}
676677

677678
resctrl_cpu_detect(c);
679+
680+
tsa_init(c);
678681
}
679682

680683
static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
@@ -719,8 +722,6 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
719722
goto clear_sev;
720723

721724

722-
tsa_init(c);
723-
724725
return;
725726

726727
clear_all:

0 commit comments

Comments
 (0)