@@ -17,31 +17,21 @@ CONFIG_X86_VSYSCALL_EMULATION=y
1717CONFIG_NUMA=y
1818CONFIG_AMD_NUMA=y
1919CONFIG_X86_64_ACPI_NUMA=y
20- CONFIG_NUMA_EMU=y
2120CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
2221CONFIG_X86_SGX=y
22+ CONFIG_X86_USER_SHADOW_STACK=y
2323CONFIG_EFI_MIXED=y
2424CONFIG_RANDOMIZE_MEMORY=y
25+ CONFIG_ADDRESS_MASKING=y
2526## choice: vsyscall table for legacy applications
2627CONFIG_LEGACY_VSYSCALL_NONE=y
2728## end choice
28- CONFIG_SLS =y
29+ CONFIG_MITIGATION_SLS =y
2930CONFIG_PCI_MMCONFIG=y
3031CONFIG_ISA_DMA_API=y
3132CONFIG_X86_X32_ABI=y
3233CONFIG_X86_X32_DISABLED=y
3334
34- ##
35- ## file: arch/x86/Kconfig.cpu
36- ##
37- ## choice: Processor family
38- # CONFIG_MK8 is not set
39- # CONFIG_MPSC is not set
40- # CONFIG_MCORE2 is not set
41- # CONFIG_MATOM is not set
42- CONFIG_GENERIC_CPU=y
43- ## end choice
44-
4535##
4636## file: arch/x86/crypto/Kconfig
4737##
@@ -58,16 +48,15 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
5848CONFIG_CRYPTO_TWOFISH_X86_64=m
5949CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
6050CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
61- CONFIG_CRYPTO_CHACHA20_X86_64=m
6251CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
6352CONFIG_CRYPTO_NHPOLY1305_SSE2=m
6453CONFIG_CRYPTO_NHPOLY1305_AVX2=m
65- CONFIG_CRYPTO_POLY1305_X86_64=m
66- CONFIG_CRYPTO_SHA1_SSSE3=m
67- CONFIG_CRYPTO_SHA256_SSSE3=m
68- CONFIG_CRYPTO_SHA512_SSSE3=m
6954CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
70- CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
55+
56+ ##
57+ ## file: arch/x86/kvm/Kconfig
58+ ##
59+ CONFIG_KVM_XEN=y
7160
7261##
7362## file: arch/x86/ras/Kconfig
@@ -84,6 +73,26 @@ CONFIG_XEN_512GB=y
8473##
8574CONFIG_SIGNED_PE_FILE_VERIFICATION=y
8675
76+ ##
77+ ## file: drivers/accel/Kconfig
78+ ##
79+ CONFIG_DRM_ACCEL=y
80+
81+ ##
82+ ## file: drivers/accel/amdxdna/Kconfig
83+ ##
84+ CONFIG_DRM_ACCEL_AMDXDNA=m
85+
86+ ##
87+ ## file: drivers/accel/habanalabs/Kconfig
88+ ##
89+ CONFIG_DRM_ACCEL_HABANALABS=m
90+
91+ ##
92+ ## file: drivers/accel/ivpu/Kconfig
93+ ##
94+ CONFIG_DRM_ACCEL_IVPU=m
95+
8796##
8897## file: drivers/acpi/Kconfig
8998##
@@ -101,6 +110,11 @@ CONFIG_AGP=y
101110#. Needed by GART_IOMMU
102111CONFIG_AGP_AMD64=y
103112
113+ ##
114+ ## file: drivers/crypto/intel/iaa/Kconfig
115+ ##
116+ CONFIG_CRYPTO_DEV_IAA_CRYPTO=m
117+
104118##
105119## file: drivers/cxl/Kconfig
106120##
@@ -119,6 +133,11 @@ CONFIG_INTEL_IDXD_PERFMON=y
119133CONFIG_EDAC_SBRIDGE=m
120134CONFIG_EDAC_IGEN6=m
121135
136+ ##
137+ ## file: drivers/gpu/drm/amd/amdkfd/Kconfig
138+ ##
139+ CONFIG_HSA_AMD_SVM=y
140+
122141##
123142## file: drivers/gpu/drm/i915/Kconfig
124143##
@@ -151,6 +170,11 @@ CONFIG_STM_SOURCE_FTRACE=m
151170##
152171CONFIG_I2C_STUB=m
153172
173+ ##
174+ ## file: drivers/infiniband/hw/mana/Kconfig
175+ ##
176+ CONFIG_MANA_INFINIBAND=m
177+
154178##
155179## file: drivers/input/mouse/Kconfig
156180##
@@ -159,19 +183,27 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
159183CONFIG_MOUSE_PS2_LIFEBOOK=y
160184CONFIG_MOUSE_PS2_TRACKPOINT=y
161185
186+ ##
187+ ## file: drivers/iommu/Kconfig
188+ ##
189+ CONFIG_VIRTIO_IOMMU=m
190+
162191##
163192## file: drivers/iommu/amd/Kconfig
164193##
165194CONFIG_AMD_IOMMU=y
166- #. Can be built as a module, but nothing will trigger loading
167- CONFIG_AMD_IOMMU_V2=y
168195
169196##
170197## file: drivers/macintosh/Kconfig
171198##
172199CONFIG_MACINTOSH_DRIVERS=y
173200CONFIG_MAC_EMUMOUSEBTN=y
174201
202+ ##
203+ ## file: drivers/misc/Kconfig
204+ ##
205+ CONFIG_NSM=m
206+
175207##
176208## file: drivers/net/Kconfig
177209##
@@ -188,6 +220,11 @@ CONFIG_AMD_XGBE=m
188220CONFIG_NET_VENDOR_GOOGLE=y
189221CONFIG_GVE=m
190222
223+ ##
224+ ## file: drivers/net/ethernet/intel/idpf/Kconfig
225+ ##
226+ CONFIG_IDPF=m
227+
191228##
192229## file: drivers/net/ethernet/microsoft/Kconfig
193230##
@@ -207,18 +244,29 @@ CONFIG_NVDIMM_PFN=y
207244##
208245## file: drivers/pci/Kconfig
209246##
247+ CONFIG_PCI_P2PDMA=y
210248CONFIG_PCI_HYPERV=y
211249
212250##
213251## file: drivers/pinctrl/Kconfig
214252##
215253CONFIG_PINCTRL_AMD=y
216254
255+ ##
256+ ## file: drivers/platform/x86/Kconfig
257+ ##
258+ CONFIG_SAMSUNG_GALAXYBOOK=m
259+
217260##
218261## file: drivers/platform/x86/amd/pmc/Kconfig
219262##
220263CONFIG_AMD_PMC=m
221264
265+ ##
266+ ## file: drivers/platform/x86/amd/pmf/Kconfig
267+ ##
268+ CONFIG_AMD_PMF=m
269+
222270##
223271## file: drivers/platform/x86/intel/Kconfig
224272##
@@ -248,6 +296,17 @@ CONFIG_SCSI_INIA100=m
248296## file: drivers/spi/Kconfig
249297##
250298CONFIG_SPI_PXA2XX=m
299+ CONFIG_SPI_AMD=m
300+
301+ ##
302+ ## file: drivers/tee/Kconfig
303+ ##
304+ CONFIG_TEE=m
305+
306+ ##
307+ ## file: drivers/tee/amdtee/Kconfig
308+ ##
309+ CONFIG_AMDTEE=m
251310
252311##
253312## file: drivers/tty/Kconfig
@@ -267,6 +326,11 @@ CONFIG_FB_MATROX_MAVEN=m
267326##
268327CONFIG_TDX_GUEST_DRIVER=m
269328
329+ ##
330+ ## file: drivers/virt/nitro_enclaves/Kconfig
331+ ##
332+ CONFIG_NITRO_ENCLAVES=m
333+
270334##
271335## file: drivers/virtio/Kconfig
272336##
@@ -289,18 +353,10 @@ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
289353##
290354CONFIG_LIVEPATCH=y
291355
292- ##
293- ## file: kernel/rcu/Kconfig
294- ##
295- CONFIG_RCU_FANOUT=64
296-
297356##
298357## file: lib/Kconfig.debug
299358##
300359CONFIG_DEBUG_INFO_BTF=y
301- #. Workaround module loading of different builds of on-disk modules
302- #. vs booted kernel when keeping same ABI, cf. #1003210, #1022202
303- CONFIG_MODULE_ALLOW_BTF_MISMATCH=y
304360CONFIG_FRAME_WARN=2048
305361
306362##
@@ -309,9 +365,7 @@ CONFIG_FRAME_WARN=2048
309365## choice: Memory model
310366CONFIG_SPARSEMEM_MANUAL=y
311367## end choice
312- CONFIG_SPARSEMEM_VMEMMAP=y
313- CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
314- CONFIG_ZONE_DEVICE=y
368+ CONFIG_NUMA_EMU=y
315369
316370##
317371## file: security/Kconfig
@@ -324,3 +378,11 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
324378CONFIG_SND_SOC_AMD_ACP3x=m
325379CONFIG_SND_SOC_AMD_RENOIR=m
326380CONFIG_SND_SOC_AMD_RENOIR_MACH=m
381+
382+ ##
383+ ## file: sound/soc/amd/acp/Kconfig
384+ ##
385+ CONFIG_SND_SOC_AMD_ACP_PCI=m
386+ CONFIG_SND_AMD_ASOC_RENOIR=m
387+ CONFIG_SND_AMD_ASOC_ACP70=m
388+ CONFIG_SND_SOC_AMD_LEGACY_MACH=m
0 commit comments