Merge tag 'x86_tdx_for_6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / arch / x86 / hyperv / ivm.c

diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index c6edde1..02e5523 100644 (file)
--- a/arch/x86/hyperv/ivm.c
+++ b/arch/x86/hyperv/ivm.c
@@ -384,7 +384,7 @@ static inline void hv_ghcb_msr_read(u64 msr, u64 *value) {}
 #ifdef CONFIG_INTEL_TDX_GUEST
 static void hv_tdx_msr_write(u64 msr, u64 val)
 {
-       struct tdx_hypercall_args args = {
+       struct tdx_module_args args = {
                .r10 = TDX_HYPERCALL_STANDARD,
                .r11 = EXIT_REASON_MSR_WRITE,
                .r12 = msr,
@@ -398,13 +398,13 @@ static void hv_tdx_msr_write(u64 msr, u64 val)
 
 static void hv_tdx_msr_read(u64 msr, u64 *val)
 {
-       struct tdx_hypercall_args args = {
+       struct tdx_module_args args = {
                .r10 = TDX_HYPERCALL_STANDARD,
                .r11 = EXIT_REASON_MSR_READ,
                .r12 = msr,
        };
 
-       u64 ret = __tdx_hypercall_ret(&args);
+       u64 ret = __tdx_hypercall(&args);
 
        if (WARN_ONCE(ret, "Failed to emulate MSR read: %lld\n", ret))
                *val = 0;
@@ -414,13 +414,13 @@ static void hv_tdx_msr_read(u64 msr, u64 *val)
 
 u64 hv_tdx_hypercall(u64 control, u64 param1, u64 param2)
 {
-       struct tdx_hypercall_args args = { };
+       struct tdx_module_args args = { };
 
        args.r10 = control;
        args.rdx = param1;
        args.r8  = param2;
 
-       (void)__tdx_hypercall_ret(&args);
+       (void)__tdx_hypercall(&args);
 
        return args.r11;
 }