Drivers: hv: vmbus: Define APIs to manipulate the message page

As part of cleaning up architecture specific code, define APIs
to manipulate the message page.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index a58c201f34120d3869587017665c6e7628de172f..1e75141bc12359d3634f82b217a5b74718d993d7 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -140,6 +140,9 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)
 #define hv_init_timer(timer, tick) wrmsrl(timer, tick)
 #define hv_init_timer_config(config, val) wrmsrl(config, val)
 
+#define hv_get_simp(val) rdmsrl(HV_X64_MSR_SIMP, val)
+#define hv_set_simp(val) wrmsrl(HV_X64_MSR_SIMP, val)
+
 void hyperv_callback_vector(void);
 #ifdef CONFIG_TRACING
 #define trace_hyperv_callback_vector hyperv_callback_vector

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index ced2077bb925683594237e276967c4e178c14f01..04ad977498843227362fc21bc8b08e1b6bff3e59 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -268,12 +268,12 @@ int hv_synic_init(unsigned int cpu)
        u64 vp_index;
 
        /* Setup the Synic's message page */
-       rdmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
+       hv_get_simp(simp.as_uint64);
        simp.simp_enabled = 1;
        simp.base_simp_gpa = virt_to_phys(hv_context.synic_message_page[cpu])
                >> PAGE_SHIFT;
 
-       wrmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
+       hv_set_simp(simp.as_uint64);
 
        /* Setup the Synic's event page */
        rdmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
@@ -392,11 +392,11 @@ int hv_synic_cleanup(unsigned int cpu)
        /* Disable the interrupt */
        wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
-       rdmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
+       hv_get_simp(simp.as_uint64);
        simp.simp_enabled = 0;
        simp.base_simp_gpa = 0;
 
-       wrmsrl(HV_X64_MSR_SIMP, simp.as_uint64);
+       hv_set_simp(simp.as_uint64);
 
        rdmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
        siefp.siefp_enabled = 0;