Commit 3c5ff0c6 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: timers: Rename kvm_timer_sync_hwstate to kvm_timer_sync_user 



kvm_timer_sync_hwstate() has nothing to do with the timer HW state,
but more to do with the state of a userspace interrupt controller.
Change the suffix from _hwstate to_user, in keeping with the rest
of the code.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 710f1982

arch/arm64/kvm/arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static void unmask_vtimer_irq_user(struct kvm_vcpu *vcpu) 
	}

}



void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)

void kvm_timer_sync_user(struct kvm_vcpu *vcpu)

{

	struct arch_timer_cpu *timer = vcpu_timer(vcpu);

arch/arm64/kvm/arm.c

+2 −2
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
			isb(); /* Ensure work in x_flush_hwstate is committed */

			kvm_pmu_sync_hwstate(vcpu);

			if (static_branch_unlikely(&userspace_irqchip_in_use))

				kvm_timer_sync_hwstate(vcpu);

				kvm_timer_sync_user(vcpu);

			kvm_vgic_sync_hwstate(vcpu);

			local_irq_enable();

			preempt_enable();
@@ -768,7 +768,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		 * timer virtual interrupt state.

		 */

		if (static_branch_unlikely(&userspace_irqchip_in_use))

			kvm_timer_sync_hwstate(vcpu);

			kvm_timer_sync_user(vcpu);



		kvm_arch_vcpu_ctxsync_fp(vcpu);

include/kvm/arm_arch_timer.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int kvm_timer_hyp_init(bool); 
int kvm_timer_enable(struct kvm_vcpu *vcpu);

int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);

void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);

void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);

void kvm_timer_sync_user(struct kvm_vcpu *vcpu);

bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu);

void kvm_timer_update_run(struct kvm_vcpu *vcpu);

void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu);