diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 19:22:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 19:22:21 -0700 |
| commit | 4dd39ddeb68fbb6d068611f2cc647948dc7dfca0 (patch) | |
| tree | 2daf268154b367b2a2e557dfa43c41d9e3a3e83a /arch/x86/kernel/cpu | |
| parent | Merge tag 'x86-cleanups-2025-07-29' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge tag 'v6.16' into x86/cpu, to resolve conflict (diff) | |
| download | linux-4dd39ddeb68fbb6d068611f2cc647948dc7dfca0.tar.gz linux-4dd39ddeb68fbb6d068611f2cc647948dc7dfca0.zip | |
Merge tag 'x86-cpu-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu update from Ingo Molnar:
"Add user-space CPUID faulting support for AMD CPUs"
* tag 'x86-cpu-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/CPU/AMD: Add CPUID faulting support
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 329ee185d8cc..a5ece6ebe8a7 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -530,9 +530,11 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) } bsp_determine_snp(c); - tsa_init(c); + if (cpu_has(c, X86_FEATURE_GP_ON_USER_CPUID)) + setup_force_cpu_cap(X86_FEATURE_CPUID_FAULT); + return; warn: |