x86/hyperv: Remove aliases with X64 in their name

In the architecture independent version of hyperv-tlfs.h, commit c55a844f46f958b
removed the "X64" in the symbol names so they would make sense for both x86 and
ARM64.  That commit added aliases with the "X64" in the x86 version of hyperv-tlfs.h
so that existing x86 code would continue to compile.

As a cleanup, update the x86 code to use the symbols without the "X64", then remove
the aliases.  There's no functional change.

Signed-off-by: Joseph Salisbury <joseph.salisbury@microsoft.com>
Link: https://lore.kernel.org/r/1601130386-11111-1-git-send-email-jsalisbury@linux.microsoft.com
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 6035df1b49e1a76d2e68dcb1502feae70916a003..e04d90af4c27cd4966351d277e945ff4df47461b 100644 (file)
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -148,9 +148,9 @@ static inline bool hv_reenlightenment_available(void)
         * Check for required features and priviliges to make TSC frequency
         * change notifications work.
         */
-       return ms_hyperv.features & HV_X64_ACCESS_FREQUENCY_MSRS &&
+       return ms_hyperv.features & HV_ACCESS_FREQUENCY_MSRS &&
                ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE &&
-               ms_hyperv.features & HV_X64_ACCESS_REENLIGHTENMENT;
+               ms_hyperv.features & HV_ACCESS_REENLIGHTENMENT;
 }
 
 DEFINE_IDTENTRY_SYSVEC(sysvec_hyperv_reenlightenment)
@@ -330,8 +330,8 @@ void __init hyperv_init(void)
                return;
 
        /* Absolutely required MSRs */
-       required_msrs = HV_X64_MSR_HYPERCALL_AVAILABLE |
-               HV_X64_MSR_VP_INDEX_AVAILABLE;
+       required_msrs = HV_MSR_HYPERCALL_AVAILABLE |
+               HV_MSR_VP_INDEX_AVAILABLE;
 
        if ((ms_hyperv.features & required_msrs) != required_msrs)
                return;

diff --git a/arch/x86/hyperv/hv_spinlock.c b/arch/x86/hyperv/hv_spinlock.c
index 07f21a06392fb9940c28025e654d66c2740846f1..f3270c1fc48c1dba158a8af7cac7a4ad30405e45 100644 (file)
--- a/arch/x86/hyperv/hv_spinlock.c
+++ b/arch/x86/hyperv/hv_spinlock.c
@@ -66,7 +66,7 @@ void __init hv_init_spinlocks(void)
 {
        if (!hv_pvspin || !apic ||
            !(ms_hyperv.hints & HV_X64_CLUSTER_IPI_RECOMMENDED) ||
-           !(ms_hyperv.features & HV_X64_MSR_GUEST_IDLE_AVAILABLE)) {
+           !(ms_hyperv.features & HV_MSR_GUEST_IDLE_AVAILABLE)) {
                pr_info("PV spinlocks disabled\n");
                return;
        }

diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h
index 7a4d2062385cc889956857dea49d3cf51adda8f8..0ed20e8bba9e5bfba8f0490f43d5b08fd9a57948 100644 (file)
--- a/arch/x86/include/asm/hyperv-tlfs.h
+++ b/arch/x86/include/asm/hyperv-tlfs.h
@@ -27,39 +27,6 @@
 #define HYPERV_CPUID_MIN                       0x40000005
 #define HYPERV_CPUID_MAX                       0x4000ffff
 
-/*
- * Aliases for Group A features that have X64 in the name.
- * On x86/x64 these are HYPERV_CPUID_FEATURES.EAX bits.
- */
-
-#define HV_X64_MSR_VP_RUNTIME_AVAILABLE                \
-               HV_MSR_VP_RUNTIME_AVAILABLE
-#define HV_X64_MSR_SYNIC_AVAILABLE             \
-               HV_MSR_SYNIC_AVAILABLE
-#define HV_X64_MSR_APIC_ACCESS_AVAILABLE       \
-               HV_MSR_APIC_ACCESS_AVAILABLE
-#define HV_X64_MSR_HYPERCALL_AVAILABLE         \
-               HV_MSR_HYPERCALL_AVAILABLE
-#define HV_X64_MSR_VP_INDEX_AVAILABLE          \
-               HV_MSR_VP_INDEX_AVAILABLE
-#define HV_X64_MSR_RESET_AVAILABLE             \
-               HV_MSR_RESET_AVAILABLE
-#define HV_X64_MSR_GUEST_IDLE_AVAILABLE                \
-               HV_MSR_GUEST_IDLE_AVAILABLE
-#define HV_X64_ACCESS_FREQUENCY_MSRS           \
-               HV_ACCESS_FREQUENCY_MSRS
-#define HV_X64_ACCESS_REENLIGHTENMENT          \
-               HV_ACCESS_REENLIGHTENMENT
-#define HV_X64_ACCESS_TSC_INVARIANT            \
-               HV_ACCESS_TSC_INVARIANT
-
-/*
- * Aliases for Group B features that have X64 in the name.
- * On x86/x64 these are HYPERV_CPUID_FEATURES.EBX bits.
- */
-#define HV_X64_POST_MESSAGES           HV_POST_MESSAGES
-#define HV_X64_SIGNAL_EVENTS           HV_SIGNAL_EVENTS
-
 /*
  * Group D Features.  The bit assignments are custom to each architecture.
  * On x86/x64 these are HYPERV_CPUID_FEATURES.EDX bits.

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 31125448b174d5580de646920c28ed44bf38e7f3..9834a43cd0fa1d7b987c824dddd9d5833dd44d24 100644 (file)
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -248,7 +248,7 @@ static void __init ms_hyperv_init_platform(void)
                        hv_host_info_edx >> 24, hv_host_info_edx & 0xFFFFFF);
        }
 
-       if (ms_hyperv.features & HV_X64_ACCESS_FREQUENCY_MSRS &&
+       if (ms_hyperv.features & HV_ACCESS_FREQUENCY_MSRS &&
            ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE) {
                x86_platform.calibrate_tsc = hv_get_tsc_khz;
                x86_platform.calibrate_cpu = hv_get_tsc_khz;
@@ -270,7 +270,7 @@ static void __init ms_hyperv_init_platform(void)
                crash_kexec_post_notifiers = true;
 
 #ifdef CONFIG_X86_LOCAL_APIC
-       if (ms_hyperv.features & HV_X64_ACCESS_FREQUENCY_MSRS &&
+       if (ms_hyperv.features & HV_ACCESS_FREQUENCY_MSRS &&
            ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE) {
                /*
                 * Get the APIC frequency.
@@ -296,7 +296,7 @@ static void __init ms_hyperv_init_platform(void)
        machine_ops.shutdown = hv_machine_shutdown;
        machine_ops.crash_shutdown = hv_machine_crash_shutdown;
 #endif
-       if (ms_hyperv.features & HV_X64_ACCESS_TSC_INVARIANT) {
+       if (ms_hyperv.features & HV_ACCESS_TSC_INVARIANT) {
                wrmsrl(HV_X64_MSR_TSC_INVARIANT_CONTROL, 0x1);
                setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);
        } else {
@@ -330,7 +330,7 @@ static void __init ms_hyperv_init_platform(void)
        alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, asm_sysvec_hyperv_callback);
 
        /* Setup the IDT for reenlightenment notifications */
-       if (ms_hyperv.features & HV_X64_ACCESS_REENLIGHTENMENT) {
+       if (ms_hyperv.features & HV_ACCESS_REENLIGHTENMENT) {
                alloc_intr_gate(HYPERV_REENLIGHTENMENT_VECTOR,
                                asm_sysvec_hyperv_reenlightenment);
        }

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 814d3aee5ceff10b2ac1d16bfaeebd40c9c75983..21d375a9c4da5379f48eac5c1839aea84224e391 100644 (file)
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -2000,20 +2000,20 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
                        break;
 
                case HYPERV_CPUID_FEATURES:
-                       ent->eax |= HV_X64_MSR_VP_RUNTIME_AVAILABLE;
+                       ent->eax |= HV_MSR_VP_RUNTIME_AVAILABLE;
                        ent->eax |= HV_MSR_TIME_REF_COUNT_AVAILABLE;
-                       ent->eax |= HV_X64_MSR_SYNIC_AVAILABLE;
+                       ent->eax |= HV_MSR_SYNIC_AVAILABLE;
                        ent->eax |= HV_MSR_SYNTIMER_AVAILABLE;
-                       ent->eax |= HV_X64_MSR_APIC_ACCESS_AVAILABLE;
-                       ent->eax |= HV_X64_MSR_HYPERCALL_AVAILABLE;
-                       ent->eax |= HV_X64_MSR_VP_INDEX_AVAILABLE;
-                       ent->eax |= HV_X64_MSR_RESET_AVAILABLE;
+                       ent->eax |= HV_MSR_APIC_ACCESS_AVAILABLE;
+                       ent->eax |= HV_MSR_HYPERCALL_AVAILABLE;
+                       ent->eax |= HV_MSR_VP_INDEX_AVAILABLE;
+                       ent->eax |= HV_MSR_RESET_AVAILABLE;
                        ent->eax |= HV_MSR_REFERENCE_TSC_AVAILABLE;
-                       ent->eax |= HV_X64_ACCESS_FREQUENCY_MSRS;
-                       ent->eax |= HV_X64_ACCESS_REENLIGHTENMENT;
+                       ent->eax |= HV_ACCESS_FREQUENCY_MSRS;
+                       ent->eax |= HV_ACCESS_REENLIGHTENMENT;
 
-                       ent->ebx |= HV_X64_POST_MESSAGES;
-                       ent->ebx |= HV_X64_SIGNAL_EVENTS;
+                       ent->ebx |= HV_POST_MESSAGES;
+                       ent->ebx |= HV_SIGNAL_EVENTS;
 
                        ent->edx |= HV_FEATURE_FREQUENCY_MSRS_AVAILABLE;
                        ent->edx |= HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE;