x86/tdx: Rename tdx_parse_tdinfo() to tdx_setup()

[ Upstream commit b064043d9565786b385f85e6436ca5716bbd5552 ]

Rename tdx_parse_tdinfo() to tdx_setup() and move setting NOTIFY_ENABLES
there.

The function will be extended to adjust TD configuration.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/all/20241104103803.195705-3-kirill.shutemov%40linux.intel.com
Stable-dep-of: f65aa0ad79fc ("x86/tdx: Dynamically disable SEPT violations from causing #VEs")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
index c74bb9e7d7a35f1e62f18d1e64ff056772265711..28b321a95a5e81ed01980c9caf568e72abcd6463 100644 (file)
--- a/arch/x86/coco/tdx/tdx.c
+++ b/arch/x86/coco/tdx/tdx.c
@@ -194,7 +194,7 @@ static void __noreturn tdx_panic(const char *msg)
                __tdx_hypercall(&args);
 }
 
-static void tdx_parse_tdinfo(u64 *cc_mask)
+static void tdx_setup(u64 *cc_mask)
 {
        struct tdx_module_args args = {};
        unsigned int gpa_width;
@@ -219,6 +219,9 @@ static void tdx_parse_tdinfo(u64 *cc_mask)
        gpa_width = args.rcx & GENMASK(5, 0);
        *cc_mask = BIT_ULL(gpa_width - 1);
 
+       /* Kernel does not use NOTIFY_ENABLES and does not need random #VEs */
+       tdg_vm_wr(TDCS_NOTIFY_ENABLES, 0, -1ULL);
+
        /*
         * The kernel can not handle #VE's when accessing normal kernel
         * memory.  Ensure that no #VE will be delivered for accesses to
@@ -969,11 +972,11 @@ void __init tdx_early_init(void)
        setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);
 
        cc_vendor = CC_VENDOR_INTEL;
-       tdx_parse_tdinfo(&cc_mask);
-       cc_set_mask(cc_mask);
 
-       /* Kernel does not use NOTIFY_ENABLES and does not need random #VEs */
-       tdg_vm_wr(TDCS_NOTIFY_ENABLES, 0, -1ULL);
+       /* Configure the TD */
+       tdx_setup(&cc_mask);
+
+       cc_set_mask(cc_mask);
 
        /*
         * All bits above GPA width are reserved and kernel treats shared bit