Skip to content

Commit 5cf8061

Browse files
committed
Merge tag 'x86-urgent-2025-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: - Fix AVX-VNNI CPU feature dependency bug triggered via the 'noxsave' boot option - Fix typos in the SVA documentation - Add Tony Luck as RDT co-maintainer and remove Fenghua Yu * tag 'x86-urgent-2025-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: docs: arch/x86/sva: Fix two grammar errors under Background and FAQ x86/cpufeatures: Make AVX-VNNI depend on AVX MAINTAINERS: Change maintainer for RDT
2 parents 8b82c18 + c9876cd commit 5cf8061

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Documentation/arch/x86/sva.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the
2525
mmu_notifier() support to keep the device TLB cache and the CPU cache in
2626
sync. When an ATS lookup fails for a virtual address, the device should
2727
use the PRI in order to request the virtual address to be paged into the
28-
CPU page tables. The device must use ATS again in order the fetch the
28+
CPU page tables. The device must use ATS again in order to fetch the
2929
translation before use.
3030

3131
Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions.
216216

217217
Single Root I/O Virtualization (SR-IOV) focuses on providing independent
218218
hardware interfaces for virtualizing hardware. Hence, it's required to be
219-
almost fully functional interface to software supporting the traditional
219+
an almost fully functional interface to software supporting the traditional
220220
BARs, space for interrupts via MSI-X, its own register layout.
221221
Virtual Functions (VFs) are assisted by the Physical Function (PF)
222222
driver.

MAINTAINERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -19879,7 +19879,7 @@ F: net/rds/
1987919879
F: tools/testing/selftests/net/rds/
1988019880

1988119881
RDT - RESOURCE ALLOCATION
19882-
M: Fenghua Yu <fenghua.yu@intel.com>
19882+
M: Tony Luck <tony.luck@intel.com>
1988319883
M: Reinette Chatre <[email protected]>
1988419884
1988519885
S: Supported

arch/x86/kernel/cpu/cpuid-deps.c

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static const struct cpuid_dep cpuid_deps[] = {
4545
{ X86_FEATURE_AES, X86_FEATURE_XMM2 },
4646
{ X86_FEATURE_SHA_NI, X86_FEATURE_XMM2 },
4747
{ X86_FEATURE_GFNI, X86_FEATURE_XMM2 },
48+
{ X86_FEATURE_AVX_VNNI, X86_FEATURE_AVX },
4849
{ X86_FEATURE_FMA, X86_FEATURE_AVX },
4950
{ X86_FEATURE_VAES, X86_FEATURE_AVX },
5051
{ X86_FEATURE_VPCLMULQDQ, X86_FEATURE_AVX },

0 commit comments

Comments
 (0)