From 8115a0522db723245ff30fdcc67e4e00b8394e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Tue, 9 May 2023 14:11:19 +0200
Subject: [PATCH] versions: tdx: Update Kernel to 6.2 + TDX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tools/packaging/kernel/configs/fragments/whitelist.conf      | 4 ++++
 tools/packaging/kernel/configs/fragments/x86_64/tdx/tdx.conf | 3 ---
 tools/packaging/kernel/kata_config_version                   | 2 +-
 tools/packaging/kernel/patches/6.2-TDX-v1.x/no_patches.txt   | 0
 versions.yaml                                                | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 tools/packaging/kernel/patches/6.2-TDX-v1.x/no_patches.txt

diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf
index d6e04444f6..25198cebdc 100644
--- a/tools/packaging/kernel/configs/fragments/whitelist.conf
+++ b/tools/packaging/kernel/configs/fragments/whitelist.conf
@@ -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
diff --git a/tools/packaging/kernel/configs/fragments/x86_64/tdx/tdx.conf b/tools/packaging/kernel/configs/fragments/x86_64/tdx/tdx.conf
index 2f877a5c99..7d88bb9f03 100644
--- a/tools/packaging/kernel/configs/fragments/x86_64/tdx/tdx.conf
+++ b/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
diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version
index 194b81caae..9b252fd090 100644
--- a/tools/packaging/kernel/kata_config_version
+++ b/tools/packaging/kernel/kata_config_version
@@ -1 +1 @@
-112
+113
diff --git a/tools/packaging/kernel/patches/6.2-TDX-v1.x/no_patches.txt b/tools/packaging/kernel/patches/6.2-TDX-v1.x/no_patches.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/versions.yaml b/versions.yaml
index d573f90a1c..81ce1401e9 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -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"