Skip to content

Commit 66f0e3e

Browse files
committed
x86/CPU/AMD: Add X86_FEATURE_ZEN6
JIRA: https://issues.redhat.com/browse/RHEL-106912 commit 24ee8d9 Author: Yazen Ghannam <yazen.ghannam@amd.com> Date: Tue May 13 20:48:57 2025 +0000 x86/CPU/AMD: Add X86_FEATURE_ZEN6 Add a synthetic feature flag for Zen6. [ bp: Move the feature flag to a free slot and avoid future merge conflicts from incoming stuff. ] Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/20250513204857.3376577-1-yazen.ghannam@amd.com Signed-off-by: David Arcari <darcari@redhat.com>
1 parent fd9fc17 commit 66f0e3e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

arch/x86/include/asm/cpufeatures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
#define X86_FEATURE_CENTAUR_MCR ( 3*32+ 3) /* "centaur_mcr" Centaur MCRs (= MTRRs) */
8686
#define X86_FEATURE_K8 ( 3*32+ 4) /* Opteron, Athlon64 */
8787
#define X86_FEATURE_ZEN5 ( 3*32+ 5) /* CPU based on Zen5 microarchitecture */
88-
/* Free ( 3*32+ 6) */
88+
#define X86_FEATURE_ZEN6 ( 3*32+ 6) /* CPU based on Zen6 microarchitecture */
8989
/* Free ( 3*32+ 7) */
9090
#define X86_FEATURE_CONSTANT_TSC ( 3*32+ 8) /* "constant_tsc" TSC ticks at a constant rate */
9191
#define X86_FEATURE_UP ( 3*32+ 9) /* "up" SMP kernel running on UP */

arch/x86/kernel/cpu/amd.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,11 @@ static void bsp_init_amd(struct cpuinfo_x86 *c)
465465
case 0x70 ... 0x7f:
466466
setup_force_cpu_cap(X86_FEATURE_ZEN5);
467467
break;
468+
case 0x50 ... 0x5f:
469+
case 0x90 ... 0xaf:
470+
case 0xc0 ... 0xcf:
471+
setup_force_cpu_cap(X86_FEATURE_ZEN6);
472+
break;
468473
default:
469474
goto warn;
470475
}

0 commit comments

Comments
 (0)