[tip: x86/cpu] x86/cpuid: Add AMX and SPEC_CTRL dependencies

From: tip-bot2 for Andi Kleen
Date: Sun Apr 06 2025 - 14:02:20 EST


The following commit has been merged into the x86/cpu branch of tip:

Commit-ID: e37aa1211fbfeb9d5e79f4a4b0da898e6d0d53bb
Gitweb: https://git.kernel.org/tip/e37aa1211fbfeb9d5e79f4a4b0da898e6d0d53bb
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
AuthorDate: Tue, 24 Sep 2024 10:01:28 -07:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Sun, 06 Apr 2025 19:54:35 +02:00

x86/cpuid: Add AMX and SPEC_CTRL dependencies

Add some missing dependencies to the CPUID dependency table:

- All the AMX features depend on AMX_TILE
- All the SPEC_CTRL features depend on SPEC_CTRL

[ mingo: Keep the AMX part of the table grouped ... ]

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Sohil Mehta <sohil.mehta@xxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240924170128.2611854-1-ak@xxxxxxxxxxxxxxx
---
arch/x86/kernel/cpu/cpuid-deps.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c
index a2fbea0..94c062c 100644
--- a/arch/x86/kernel/cpu/cpuid-deps.c
+++ b/arch/x86/kernel/cpu/cpuid-deps.c
@@ -82,8 +82,12 @@ static const struct cpuid_dep cpuid_deps[] = {
{ X86_FEATURE_XFD, X86_FEATURE_XSAVES },
{ X86_FEATURE_XFD, X86_FEATURE_XGETBV1 },
{ X86_FEATURE_AMX_TILE, X86_FEATURE_XFD },
+ { X86_FEATURE_AMX_FP16, X86_FEATURE_AMX_TILE },
+ { X86_FEATURE_AMX_BF16, X86_FEATURE_AMX_TILE },
+ { X86_FEATURE_AMX_INT8, X86_FEATURE_AMX_TILE },
{ X86_FEATURE_SHSTK, X86_FEATURE_XSAVES },
{ X86_FEATURE_FRED, X86_FEATURE_LKGS },
+ { X86_FEATURE_SPEC_CTRL_SSBD, X86_FEATURE_SPEC_CTRL },
{}
};