Commit 8f7df795 authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Refactor kvm_reset_cptr_el2() 



Fold kvm_get_reset_cptr_el2() into kvm_reset_cptr_el2(), since it
is its only caller. Add a comment to clarify that this function
is meant for the host value of cptr_el2.

No functional change intended.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20241216105057.579031-14-tabba@google.com


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

arch/arm64/include/asm/kvm_emulate.h

+2 −8
Original line number Diff line number Diff line
@@ -619,7 +619,8 @@ static __always_inline void kvm_write_cptr_el2(u64 val) 
		write_sysreg(val, cptr_el2);

}



static __always_inline u64 kvm_get_reset_cptr_el2(struct kvm_vcpu *vcpu)

/* Resets the value of cptr_el2 when returning to the host. */

static __always_inline void kvm_reset_cptr_el2(struct kvm_vcpu *vcpu)

{

	u64 val;
@@ -643,13 +644,6 @@ static __always_inline u64 kvm_get_reset_cptr_el2(struct kvm_vcpu *vcpu) 
			val &= ~CPTR_EL2_TSM;

	}



	return val;

}



static __always_inline void kvm_reset_cptr_el2(struct kvm_vcpu *vcpu)

{

	u64 val = kvm_get_reset_cptr_el2(vcpu);



	kvm_write_cptr_el2(val);

}