Drivers: hv: Rename the SynIC enable and disable routines

The confidential VMBus requires support for the both hypervisor
facing SynIC and the paravisor one.

Rename the functions that enable and disable SynIC with the
hypervisor. No functional changes.

Signed-off-by: Roman Kisel <romank@linux.microsoft.com>
Reviewed-by: Tianyu Lan <tiala@microsoft.com>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 1a33c6944b3c4e215ef34282fa797b1e05b171a3..6d66cbc9030b230d80f169b7023118f189edfc44 100644 (file)
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -846,7 +846,7 @@ static void vmbus_wait_for_unload(void)
                        /*
                         * In a CoCo VM the hyp_synic_message_page is not allocated
                         * in hv_synic_alloc(). Instead it is set/cleared in
-                        * hv_synic_enable_regs() and hv_synic_disable_regs()
+                        * hv_hyp_synic_enable_regs() and hv_hyp_synic_disable_regs()
                         * such that it is set only when the CPU is online. If
                         * not all present CPUs are online, the message page
                         * might be NULL, so skip such CPUs.

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 77da2d2113789917ab86012aadb5dd1fa6108151..81b6c3b0f21a4a83cc9c21dade356de9619de0fa 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -268,9 +268,10 @@ void hv_synic_free(void)
 }
 
 /*
- * hv_synic_enable_regs - Initialize the Synthetic Interrupt Controller.
+ * hv_hyp_synic_enable_regs - Initialize the Synthetic Interrupt Controller
+ * with the hypervisor.
  */
-void hv_synic_enable_regs(unsigned int cpu)
+void hv_hyp_synic_enable_regs(unsigned int cpu)
 {
        struct hv_per_cpu_context *hv_cpu =
                per_cpu_ptr(hv_context.cpu_context, cpu);
@@ -337,14 +338,14 @@ void hv_synic_enable_regs(unsigned int cpu)
 
 int hv_synic_init(unsigned int cpu)
 {
-       hv_synic_enable_regs(cpu);
+       hv_hyp_synic_enable_regs(cpu);
 
        hv_stimer_legacy_init(cpu, VMBUS_MESSAGE_SINT);
 
        return 0;
 }
 
-void hv_synic_disable_regs(unsigned int cpu)
+void hv_hyp_synic_disable_regs(unsigned int cpu)
 {
        struct hv_per_cpu_context *hv_cpu =
                per_cpu_ptr(hv_context.cpu_context, cpu);
@@ -532,7 +533,7 @@ int hv_synic_cleanup(unsigned int cpu)
 always_cleanup:
        hv_stimer_legacy_cleanup(cpu);
 
-       hv_synic_disable_regs(cpu);
+       hv_hyp_synic_disable_regs(cpu);
 
        return ret;
 }

diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 3c70051c0431279d0374880b8a097361279ef050..552ed782bcfc8aeddd296996504036c70d3afdd3 100644 (file)
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -190,10 +190,10 @@ extern int hv_synic_alloc(void);
 
 extern void hv_synic_free(void);
 
-extern void hv_synic_enable_regs(unsigned int cpu);
+extern void hv_hyp_synic_enable_regs(unsigned int cpu);
 extern int hv_synic_init(unsigned int cpu);
 
-extern void hv_synic_disable_regs(unsigned int cpu);
+extern void hv_hyp_synic_disable_regs(unsigned int cpu);
 extern int hv_synic_cleanup(unsigned int cpu);
 
 /* Interface */

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index e12f0ba0701ff6cf8a05727f362d16f894546610..2b5bf672c467180aeb4fc524af7a1a7d96f440e9 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -2810,7 +2810,7 @@ static void hv_crash_handler(struct pt_regs *regs)
         */
        cpu = smp_processor_id();
        hv_stimer_cleanup(cpu);
-       hv_synic_disable_regs(cpu);
+       hv_hyp_synic_disable_regs(cpu);
 };
 
 static int hv_synic_suspend(void)
@@ -2835,14 +2835,14 @@ static int hv_synic_suspend(void)
         * interrupts-disabled context.
         */
 
-       hv_synic_disable_regs(0);
+       hv_hyp_synic_disable_regs(0);
 
        return 0;
 }
 
 static void hv_synic_resume(void)
 {
-       hv_synic_enable_regs(0);
+       hv_hyp_synic_enable_regs(0);
 
        /*
         * Note: we don't need to call hv_stimer_init(0), because the timer