From: Roman Kisel <[email protected]> Sent: Monday, July 14, 2025 3:16 PM > > 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 <[email protected]>
Reviewed-by: Michael Kelley <[email protected]> > --- > drivers/hv/channel_mgmt.c | 2 +- > drivers/hv/hv.c | 11 ++++++----- > drivers/hv/hyperv_vmbus.h | 4 ++-- > drivers/hv/vmbus_drv.c | 6 +++--- > 4 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c > index 6f87220e2ca3..ca2fe10c110a 100644 > --- a/drivers/hv/channel_mgmt.c > +++ b/drivers/hv/channel_mgmt.c > @@ -845,7 +845,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 a8669843c56e..94a81bb3c8c7 100644 > --- a/drivers/hv/hv.c > +++ b/drivers/hv/hv.c > @@ -266,9 +266,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); > @@ -334,14 +335,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); > @@ -528,7 +529,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 16b5cf1bca19..2873703d08a9 100644 > --- a/drivers/hv/hyperv_vmbus.h > +++ b/drivers/hv/hyperv_vmbus.h > @@ -189,10 +189,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 72940a64b0b6..13aca5abc7d8 100644 > --- a/drivers/hv/vmbus_drv.c > +++ b/drivers/hv/vmbus_drv.c > @@ -2809,7 +2809,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) > @@ -2834,14 +2834,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 > -- > 2.43.0
