Skip to content

Commit 1d110fc

Browse files
committed
configs: Enable INTEL_TDX_HOST for x86_64 configs
There are customers that will need this enabled by default
1 parent fbb86ca commit 1d110fc

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

ciq/configs/kernel-x86_64-debug.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y
507507
# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
508508
CONFIG_X86_SGX=y
509509
CONFIG_X86_USER_SHADOW_STACK=y
510-
# CONFIG_INTEL_TDX_HOST is not set
510+
CONFIG_INTEL_TDX_HOST=y
511511
CONFIG_EFI=y
512512
CONFIG_EFI_STUB=y
513513
CONFIG_EFI_HANDOVER_PROTOCOL=y
@@ -811,6 +811,7 @@ CONFIG_KVM_SW_PROTECTED_VM=y
811811
CONFIG_KVM_INTEL=m
812812
# CONFIG_KVM_INTEL_PROVE_VE is not set
813813
CONFIG_X86_SGX_KVM=y
814+
CONFIG_KVM_INTEL_TDX=y
814815
CONFIG_KVM_AMD=m
815816
CONFIG_KVM_AMD_SEV=y
816817
CONFIG_KVM_IOAPIC=y
@@ -1210,6 +1211,7 @@ CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
12101211
CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
12111212
CONFIG_ARCH_WANT_HUGETLB_VMEMMAP_PREINIT=y
12121213
CONFIG_HAVE_GUP_FAST=y
1214+
CONFIG_ARCH_KEEP_MEMBLOCK=y
12131215
CONFIG_NUMA_KEEP_MEMINFO=y
12141216
CONFIG_MEMORY_ISOLATION=y
12151217
CONFIG_EXCLUSIVE_SYSTEM_RAM=y

ciq/configs/kernel-x86_64.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y
504504
# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
505505
CONFIG_X86_SGX=y
506506
CONFIG_X86_USER_SHADOW_STACK=y
507-
# CONFIG_INTEL_TDX_HOST is not set
507+
CONFIG_INTEL_TDX_HOST=y
508508
CONFIG_EFI=y
509509
CONFIG_EFI_STUB=y
510510
CONFIG_EFI_HANDOVER_PROTOCOL=y
@@ -807,6 +807,7 @@ CONFIG_KVM_SW_PROTECTED_VM=y
807807
CONFIG_KVM_INTEL=m
808808
# CONFIG_KVM_INTEL_PROVE_VE is not set
809809
CONFIG_X86_SGX_KVM=y
810+
CONFIG_KVM_INTEL_TDX=y
810811
CONFIG_KVM_AMD=m
811812
CONFIG_KVM_AMD_SEV=y
812813
CONFIG_KVM_IOAPIC=y
@@ -1207,6 +1208,7 @@ CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
12071208
CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
12081209
CONFIG_ARCH_WANT_HUGETLB_VMEMMAP_PREINIT=y
12091210
CONFIG_HAVE_GUP_FAST=y
1211+
CONFIG_ARCH_KEEP_MEMBLOCK=y
12101212
CONFIG_NUMA_KEEP_MEMINFO=y
12111213
CONFIG_MEMORY_ISOLATION=y
12121214
CONFIG_EXCLUSIVE_SYSTEM_RAM=y

0 commit comments

Comments
 (0)