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

KVM: arm64: Remove dead code resetting HCR_EL2 for pKVM 



The pKVM lifecycle does not support tearing down the hypervisor and
returning to the hyp stub once initialized. The transition to protected
mode is one-way.

Consequently, the code path in hyp-init.S responsible for resetting
EL2 registers (triggered by kexec or hibernation) is unreachable in
protected mode.

Remove the dead code handling HCR_EL2 reset for
ARM64_KVM_PROTECTED_MODE.

No functional change intended.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20260122112218.531948-2-tabba@google.com


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

arch/arm64/kvm/hyp/nvhe/hyp-init.S

+0 −5
Original line number Diff line number Diff line
@@ -260,11 +260,6 @@ reset: 
	msr	sctlr_el2, x5

	isb



alternative_if ARM64_KVM_PROTECTED_MODE

	mov_q	x5, HCR_HOST_NVHE_FLAGS

	msr_hcr_el2 x5

alternative_else_nop_endif



	/* Install stub vectors */

	adr_l	x5, __hyp_stub_vectors

	msr	vbar_el2, x5