Drivers: hv: vmbus: Get rid of unnecessary state in hv_context

Currently we are replicating state in struct hv_context that is unnecessary -
this state can be retrieved from the hypervisor. Furthermore, this is a per-cpu
state that is being maintained as a global state in struct hv_context.
Get rid of this state in struct hv_context.

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

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 332d7c34be5ceb73adfc7be889354aaf4428613d..166c2501de17948177e7d20c8519b538f458e29c 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -33,9 +33,7 @@
 #include "hyperv_vmbus.h"
 
 /* The one and only */
-struct hv_context hv_context = {
-       .synic_initialized      = false,
-};
+struct hv_context hv_context;
 
 /*
  * If false, we're using the old mechanism for stimer0 interrupts
@@ -326,8 +324,6 @@ int hv_synic_init(unsigned int cpu)
 
        hv_set_synic_state(sctrl.as_uint64);
 
-       hv_context.synic_initialized = true;
-
        /*
         * Register the per-cpu clockevent source.
         */
@@ -373,7 +369,8 @@ int hv_synic_cleanup(unsigned int cpu)
        bool channel_found = false;
        unsigned long flags;
 
-       if (!hv_context.synic_initialized)
+       hv_get_synic_state(sctrl.as_uint64);
+       if (sctrl.enable != 1)
                return -EFAULT;
 
        /*
@@ -435,7 +432,6 @@ int hv_synic_cleanup(unsigned int cpu)
        hv_set_siefp(siefp.as_uint64);
 
        /* Disable the global synic bit */
-       hv_get_synic_state(sctrl.as_uint64);
        sctrl.enable = 0;
        hv_set_synic_state(sctrl.as_uint64);
 

diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 72eaba3d50fc26da141993c5f1eadb9916d1f94d..f17c06a5e74bc90f651af0043f02834adfe307ed 100644 (file)
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -230,8 +230,6 @@ struct hv_context {
 
        void *tsc_page;
 
-       bool synic_initialized;
-
        struct hv_per_cpu_context __percpu *cpu_context;
 
        /*