Skip to content

Commit faac2ab

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: 7a0395f ("x86/bugs: Add a Transient Scheduler Attacks mitigation") Reported-by: Thomas Voegtle <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Tested-by: Thomas Voegtle <[email protected]> Message-ID: <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent fbad404 commit faac2ab

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/kernel/cpu/amd.c

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

377377
p.ext_fam = c->x86 - 0xf;
378378
p.model = c->x86_model;
379+
p.ext_model = c->x86_model >> 4;
379380
p.stepping = c->x86_stepping;
380381

381382
if (cpu_has(c, X86_FEATURE_ZEN3) ||

0 commit comments

Comments
 (0)