[PATCH 06/20] x86/tdx: Convert MSR write handling to use new TDVMCALL_0()

[Kirill A. Shutemov]

Use newly introduced TDVMCALL_0() instead of __tdx_hypercall() to handle
MSR write emulation.

It cuts code bloat substantially:

Function                                     old     new   delta
tdx_handle_virt_exception                   1947    1819    -128

Signed-off-by: Kirill A. Shutemov <kirill.shute...@linux.intel.com>
---
 arch/x86/coco/tdx/tdx.c | 9 ++-------
 arch/x86/hyperv/ivm.c   | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
index 32c519d096de..f59a2b3500db 100644
--- a/arch/x86/coco/tdx/tdx.c
+++ b/arch/x86/coco/tdx/tdx.c
@@ -399,19 +399,14 @@ static int read_msr(struct pt_regs *regs, struct ve_info 
*ve)
 
 static int write_msr(struct pt_regs *regs, struct ve_info *ve)
 {
-       struct tdx_module_args args = {
-               .r10 = TDX_HYPERCALL_STANDARD,
-               .r11 = hcall_func(EXIT_REASON_MSR_WRITE),
-               .r12 = regs->cx,
-               .r13 = (u64)regs->dx << 32 | regs->ax,
-       };
+       u64 val = (u64)regs->dx << 32 | regs->ax;
 
        /*
         * Emulate the MSR write via hypercall. More info about ABI
         * can be found in TDX Guest-Host-Communication Interface
         * (GHCI) section titled "TDG.VP.VMCALL<Instruction.WRMSR>".
         */
-       if (__tdx_hypercall(&args))
+       if (TDVMCALL_0(hcall_func(EXIT_REASON_MSR_WRITE), regs->cx, val, 0, 0))
                return -EIO;
 
        return ve_instr_len(ve);
diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index 3e2cbfb2203d..18d0892d9fc4 100644
--- a/arch/x86/hyperv/ivm.c
+++ b/arch/x86/hyperv/ivm.c
@@ -385,14 +385,9 @@ 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_module_args args = {
-               .r10 = TDX_HYPERCALL_STANDARD,
-               .r11 = EXIT_REASON_MSR_WRITE,
-               .r12 = msr,
-               .r13 = val,
-       };
+       u64 ret;
 
-       u64 ret = __tdx_hypercall(&args);
+       ret = TDVMCALL_0(hcall_func(EXIT_REASON_MSR_WRITE), msr, val, 0, 0);
 
        WARN_ONCE(ret, "Failed to emulate MSR write: %lld\n", ret);
 }
-- 
2.43.0