Skip to content

Commit

Permalink
versions: tdx: Update Kernel to 6.2 + TDX
Browse files Browse the repository at this point in the history
This is the version that's been used and tested inside Intel, and it
matches with https://github.com/intel/tdx-tools/releases/tag/2023ww15.

Fixes: #7770

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
(cherry picked from commit 8115a05)
[Greg: Fix tools/packaging/kernel/kata_config_version that got
 messed up by 32be55a)
Signed-off-by: Greg Kurz <groug@kaod.org>
  • Loading branch information
fidencio authored and gkurz committed Oct 18, 2023
1 parent a36064c commit 2f28866
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 4 additions & 0 deletions tools/packaging/kernel/configs/fragments/whitelist.conf
Expand Up @@ -2,6 +2,10 @@
# without generating an error in fragment merging
CONFIG_ARCH_RANDOM
CONFIG_ARM64_CRYPTO
CONFIG_GENERIC_MSI_IRQ_DOMAIN
CONFIG_PCI_MSI_IRQ_DOMAIN
CONFIG_CLK_LGM_CGU
CONFIG_MEMCG_SWAP
CONFIG_NF_NAT_IPV4
CONFIG_NF_NAT_NEEDED
CONFIG_NF_NAT_PROTO_DCCP
Expand Down
3 changes: 0 additions & 3 deletions tools/packaging/kernel/configs/fragments/x86_64/tdx/tdx.conf
@@ -1,13 +1,10 @@
# Intel Trust Domain Extensions (Intel TDX)

CONFIG_CLK_LGM_CGU=y
CONFIG_DMA_RESTRICTED_POOL=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_INTEL_IOMMU_SVM=y
CONFIG_INTEL_TDX_GUEST=y
CONFIG_OF=y
CONFIG_OF_RESERVED_MEM=y
CONFIG_X86_5LEVEL=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_X86_PLATFORM_DEVICES=y
2 changes: 1 addition & 1 deletion tools/packaging/kernel/kata_config_version
@@ -1 +1 @@
113
114
Empty file.
4 changes: 2 additions & 2 deletions versions.yaml
Expand Up @@ -191,9 +191,9 @@ assets:

kernel-tdx-experimental:
# yamllint disable-line rule:line-length
description: "Linux kernel with TDX support -- based on https://github.com/intel/tdx-tools/releases/tag/2023ww01"
description: "Linux kernel with TDX support -- based on https://github.com/intel/tdx-tools/releases/tag/2023ww15"
url: "https://github.com/kata-containers/linux/archive/refs/tags"
version: "5.19-TDX-v2.2"
version: "6.2-TDX-v1.8"

externals:
description: "Third-party projects used by the system"
Expand Down

0 comments on commit 2f28866

Please sign in to comment.