From dede9e7ceae92607b8b783b35a94d1fa94bf4c75 Mon Sep 17 00:00:00 2001 From: Alexey Makhalov Date: Tue, 17 Dec 2024 15:31:10 +0100 Subject: [PATCH] x86/vmware: Remove legacy VMWARE_HYPERCALL* macros BugLink: https://bugs.launchpad.net/bugs/2091941 No more direct use of these macros should be allowed. The vmware_hypercallX API still uses the new implementation of VMWARE_HYPERCALL macro internally, but it is not exposed outside of the vmware.h. Signed-off-by: Alexey Makhalov Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20240613191650.9913-8-alexey.makhalov@broadcom.com (cherry picked from commit 9dfb18031f0df2378b3d33a13fc485ef89caa285) Signed-off-by: Thibault Ferrante Acked-by: Jacob Martin Acked-by: Juerg Haefliger Signed-off-by: Mehmet Basaran --- arch/x86/include/asm/vmware.h | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h index a6dce44578bd..c9cf43d5ef23 100644 --- a/arch/x86/include/asm/vmware.h +++ b/arch/x86/include/asm/vmware.h @@ -324,30 +324,4 @@ unsigned long vmware_hypercall_hb_in(unsigned long cmd, unsigned long in2, #undef VMW_BP_CONSTRAINT #undef VMWARE_HYPERCALL -/* The low bandwidth call. The low word of edx is presumed clear. */ -#define VMWARE_HYPERCALL \ - ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT) ", %%dx; " \ - "inl (%%dx), %%eax", \ - "vmcall", X86_FEATURE_VMCALL, \ - "vmmcall", X86_FEATURE_VMW_VMMCALL) - -/* - * The high bandwidth out call. The low word of edx is presumed to have the - * HB and OUT bits set. - */ -#define VMWARE_HYPERCALL_HB_OUT \ - ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \ - "rep outsb", \ - "vmcall", X86_FEATURE_VMCALL, \ - "vmmcall", X86_FEATURE_VMW_VMMCALL) - -/* - * The high bandwidth in call. The low word of edx is presumed to have the - * HB bit set. - */ -#define VMWARE_HYPERCALL_HB_IN \ - ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \ - "rep insb", \ - "vmcall", X86_FEATURE_VMCALL, \ - "vmmcall", X86_FEATURE_VMW_VMMCALL) #endif