Drivers: hv: vmbus: Define APIs to manipulate the synthetic interrupt controller

As part of cleaning up architecture specific code, define APIs
to manipulate the interrupt controller state.

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 2ea7e16fc678b02b8ad4e7e1b67564473936af9d..1ea19a57cf4c34905e0e176e80f8c6f32d93207b 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -146,6 +146,9 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)
 #define hv_get_siefp(val) rdmsrl(HV_X64_MSR_SIEFP, val)
 #define hv_set_siefp(val) wrmsrl(HV_X64_MSR_SIEFP, val)
 
+#define hv_get_synic_state(val) rdmsrl(HV_X64_MSR_SCONTROL, val)
+#define hv_set_synic_state(val) wrmsrl(HV_X64_MSR_SCONTROL, 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 5680aeed585c0da341fa16b0eb9b428c737660a4..7cb036d4b2435623bfead59d8adecbefe4aa5607 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -294,10 +294,10 @@ int hv_synic_init(unsigned int cpu)
        wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
        /* Enable the global synic bit */
-       rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);
+       hv_get_synic_state(sctrl.as_uint64);
        sctrl.enable = 1;
 
-       wrmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);
+       hv_set_synic_state(sctrl.as_uint64);
 
        hv_context.synic_initialized = true;
 
@@ -405,9 +405,9 @@ int hv_synic_cleanup(unsigned int cpu)
        hv_set_siefp(siefp.as_uint64);
 
        /* Disable the global synic bit */
-       rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);
+       hv_get_synic_state(sctrl.as_uint64);
        sctrl.enable = 0;
-       wrmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64);
+       hv_set_synic_state(sctrl.as_uint64);
 
        return 0;
 }