Commit 6f10f2ec authored by Quentin Perret's avatar Quentin Perret Committed by Oliver Upton
Browse files

KVM: arm64: Finalise EL2 state from pKVM PSCI relay 



The EL2 state is not initialised correctly when a CPU comes out of
CPU_{SUSPEND,OFF} as the finalise_el2 function is not being called.
Let's directly call finalise_el2_state from this path to solve the
issue.

Fixes: 504ee236 ("arm64: Add the arm64.nosve command line option")
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20230201103755.1398086-5-qperret@google.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 3c4cc315

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

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ SYM_CODE_START_LOCAL(__kvm_hyp_init_cpu) 


	/* Initialize EL2 CPU state to sane values. */

	init_el2_state				// Clobbers x0..x2

	finalise_el2_state



	/* Enable MMU, set vectors and stack. */

	mov	x0, x28