Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Roman Kisel and committed by
Wei Liu
74fa5d7e 09406f2f

+12 -11
+1 -1
drivers/hv/channel_mgmt.c
··· 846 846 /* 847 847 * In a CoCo VM the hyp_synic_message_page is not allocated 848 848 * in hv_synic_alloc(). Instead it is set/cleared in 849 - * hv_synic_enable_regs() and hv_synic_disable_regs() 849 + * hv_hyp_synic_enable_regs() and hv_hyp_synic_disable_regs() 850 850 * such that it is set only when the CPU is online. If 851 851 * not all present CPUs are online, the message page 852 852 * might be NULL, so skip such CPUs.
+6 -5
drivers/hv/hv.c
··· 268 268 } 269 269 270 270 /* 271 - * hv_synic_enable_regs - Initialize the Synthetic Interrupt Controller. 271 + * hv_hyp_synic_enable_regs - Initialize the Synthetic Interrupt Controller 272 + * with the hypervisor. 272 273 */ 273 - void hv_synic_enable_regs(unsigned int cpu) 274 + void hv_hyp_synic_enable_regs(unsigned int cpu) 274 275 { 275 276 struct hv_per_cpu_context *hv_cpu = 276 277 per_cpu_ptr(hv_context.cpu_context, cpu); ··· 338 337 339 338 int hv_synic_init(unsigned int cpu) 340 339 { 341 - hv_synic_enable_regs(cpu); 340 + hv_hyp_synic_enable_regs(cpu); 342 341 343 342 hv_stimer_legacy_init(cpu, VMBUS_MESSAGE_SINT); 344 343 345 344 return 0; 346 345 } 347 346 348 - void hv_synic_disable_regs(unsigned int cpu) 347 + void hv_hyp_synic_disable_regs(unsigned int cpu) 349 348 { 350 349 struct hv_per_cpu_context *hv_cpu = 351 350 per_cpu_ptr(hv_context.cpu_context, cpu); ··· 533 532 always_cleanup: 534 533 hv_stimer_legacy_cleanup(cpu); 535 534 536 - hv_synic_disable_regs(cpu); 535 + hv_hyp_synic_disable_regs(cpu); 537 536 538 537 return ret; 539 538 }
+2 -2
drivers/hv/hyperv_vmbus.h
··· 190 190 191 191 extern void hv_synic_free(void); 192 192 193 - extern void hv_synic_enable_regs(unsigned int cpu); 193 + extern void hv_hyp_synic_enable_regs(unsigned int cpu); 194 194 extern int hv_synic_init(unsigned int cpu); 195 195 196 - extern void hv_synic_disable_regs(unsigned int cpu); 196 + extern void hv_hyp_synic_disable_regs(unsigned int cpu); 197 197 extern int hv_synic_cleanup(unsigned int cpu); 198 198 199 199 /* Interface */
+3 -3
drivers/hv/vmbus_drv.c
··· 2810 2810 */ 2811 2811 cpu = smp_processor_id(); 2812 2812 hv_stimer_cleanup(cpu); 2813 - hv_synic_disable_regs(cpu); 2813 + hv_hyp_synic_disable_regs(cpu); 2814 2814 }; 2815 2815 2816 2816 static int hv_synic_suspend(void) ··· 2835 2835 * interrupts-disabled context. 2836 2836 */ 2837 2837 2838 - hv_synic_disable_regs(0); 2838 + hv_hyp_synic_disable_regs(0); 2839 2839 2840 2840 return 0; 2841 2841 } 2842 2842 2843 2843 static void hv_synic_resume(void) 2844 2844 { 2845 - hv_synic_enable_regs(0); 2845 + hv_hyp_synic_enable_regs(0); 2846 2846 2847 2847 /* 2848 2848 * Note: we don't need to call hv_stimer_init(0), because the timer