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

As part of cleaning up architecture specific code, define APIs
to manipulate the event 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 1e75141bc12359d3634f82b217a5b74718d993d7..2ea7e16fc678b02b8ad4e7e1b67564473936af9d 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -143,6 +143,9 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)
 #define hv_get_simp(val) rdmsrl(HV_X64_MSR_SIMP, val)
 #define hv_set_simp(val) wrmsrl(HV_X64_MSR_SIMP, val)
 
+#define hv_get_siefp(val) rdmsrl(HV_X64_MSR_SIEFP, val)
+#define hv_set_siefp(val) wrmsrl(HV_X64_MSR_SIEFP, 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 04ad977498843227362fc21bc8b08e1b6bff3e59..5680aeed585c0da341fa16b0eb9b428c737660a4 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -276,12 +276,12 @@ int hv_synic_init(unsigned int cpu)
        hv_set_simp(simp.as_uint64);
 
        /* Setup the Synic's event page */
-       rdmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
+       hv_get_siefp(siefp.as_uint64);
        siefp.siefp_enabled = 1;
        siefp.base_siefp_gpa = virt_to_phys(hv_context.synic_event_page[cpu])
                >> PAGE_SHIFT;
 
-       wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
+       hv_set_siefp(siefp.as_uint64);
 
        /* Setup the shared SINT. */
        rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
@@ -398,11 +398,11 @@ int hv_synic_cleanup(unsigned int cpu)
 
        hv_set_simp(simp.as_uint64);
 
-       rdmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
+       hv_get_siefp(siefp.as_uint64);
        siefp.siefp_enabled = 0;
        siefp.base_siefp_gpa = 0;
 
-       wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
+       hv_set_siefp(siefp.as_uint64);
 
        /* Disable the global synic bit */
        rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);