Merge 6.6.98 into android15-6.6-lts
Changes in 6.6.98 x86/CPU/AMD: Properly check the TSA microcode Linux 6.6.98 Change-Id: Iee37b7105ba5505f7e5eef3f7fbcc7219f7f1d61 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
2
Makefile
2
Makefile
@@ -1,7 +1,7 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
VERSION = 6
|
VERSION = 6
|
||||||
PATCHLEVEL = 6
|
PATCHLEVEL = 6
|
||||||
SUBLEVEL = 97
|
SUBLEVEL = 98
|
||||||
EXTRAVERSION =
|
EXTRAVERSION =
|
||||||
NAME = Pinguïn Aangedreven
|
NAME = Pinguïn Aangedreven
|
||||||
|
|
||||||
|
@@ -547,6 +547,7 @@ static bool amd_check_tsa_microcode(void)
|
|||||||
|
|
||||||
p.ext_fam = c->x86 - 0xf;
|
p.ext_fam = c->x86 - 0xf;
|
||||||
p.model = c->x86_model;
|
p.model = c->x86_model;
|
||||||
|
p.ext_model = c->x86_model >> 4;
|
||||||
p.stepping = c->x86_stepping;
|
p.stepping = c->x86_stepping;
|
||||||
|
|
||||||
if (cpu_has(c, X86_FEATURE_ZEN3) ||
|
if (cpu_has(c, X86_FEATURE_ZEN3) ||
|
||||||
|
Reference in New Issue
Block a user