Skip to content

Commit 20aa3d5

Browse files
bp3tk0vgregkh
authored andcommitted
x86/CPU/AMD: Properly check the TSA microcode
In order to simplify backports, I resorted to an older version of the microcode revision checking which didn't pull in the whole struct x86_cpu_id matching machinery. My simpler method, however, forgot to add the extended CPU model to the patch revision, which lead to mismatches when determining whether TSA mitigation support is present. So add that forgotten extended model. This is a stable-only fix and the preference is to do it this way because it is a lot simpler. Also, the Fixes: tag below points to the respective stable patch. Fixes: 9029304 ("x86/bugs: Add a Transient Scheduler Attacks mitigation") Reported-by: Thomas Voegtle <tv@lio96.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Tested-by: Thomas Voegtle <tv@lio96.de> Message-ID: <04ea0a8e-edb0-c59e-ce21-5f3d5d167af3@lio96.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 59a2de1 commit 20aa3d5

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@ static bool amd_check_tsa_microcode(void)
547547

548548
p.ext_fam = c->x86 - 0xf;
549549
p.model = c->x86_model;
550+
p.ext_model = c->x86_model >> 4;
550551
p.stepping = c->x86_stepping;
551552

552553
if (cpu_has(c, X86_FEATURE_ZEN3) ||

0 commit comments

Comments
 (0)