x86/vmware: Correct macro names

JIRA: https://issues.redhat.com/browse/RHEL-52683

commit 86cb654
Author: Alexey Makhalov <alexey.makhalov@broadcom.com>
Date:   Thu Jun 13 12:16:48 2024 -0700

    x86/vmware: Correct macro names

    VCPU_RESERVED and LEGACY_X2APIC are not VMware hypercall commands.  These are
    bits in the return value of the VMWARE_CMD_GETVCPU_INFO command.  Change
    VMWARE_CMD_ prefix to GETVCPU_INFO_ one. And move the bit-shift
    operation into the macro body.

    Fixes: 4cca6ea ("x86/apic: Allow x2apic without IR on VMware platform")
    Signed-off-by: Alexey Makhalov <alexey.makhalov@broadcom.com>
    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    Link: https://lore.kernel.org/r/20240613191650.9913-7-alexey.makhalov@broadcom.com

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>

Author: vittyvk

arch/x86/kernel/cpu/vmware.c

@@ -42,8 +42,8 @@
 #define CPUID_VMWARE_INFO_LEAF               0x40000000
 #define CPUID_VMWARE_FEATURES_LEAF           0x40000010
 
-#define VMWARE_CMD_LEGACY_X2APIC  3
-#define VMWARE_CMD_VCPU_RESERVED 31
+#define GETVCPU_INFO_LEGACY_X2APIC           BIT(3)
+#define GETVCPU_INFO_VCPU_RESERVED           BIT(31)
 
 #define STEALCLOCK_NOT_AVAILABLE (-1)
 #define STEALCLOCK_DISABLED        0
@@ -485,8 +485,8 @@ static bool __init vmware_legacy_x2apic_available(void)
 	u32 eax;
 
 	eax = vmware_hypercall1(VMWARE_CMD_GETVCPU_INFO, 0);
-	return !(eax & BIT(VMWARE_CMD_VCPU_RESERVED)) &&
-		(eax & BIT(VMWARE_CMD_LEGACY_X2APIC));
+	return !(eax & GETVCPU_INFO_VCPU_RESERVED) &&
+		(eax & GETVCPU_INFO_LEGACY_X2APIC);
 }
 
 #ifdef CONFIG_AMD_MEM_ENCRYPT