Commit 7cba8a8d authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: Drop VHE-specific HYP call stub 



We now call VHE code directly, without going through any central
dispatching function. Let's drop that code.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
parent 18fc7bf8

arch/arm64/kvm/hyp.S

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ 
 * arch/arm64/kernel/hyp_stub.S.

 */

ENTRY(__kvm_call_hyp)

alternative_if_not ARM64_HAS_VIRT_HOST_EXTN

	hvc	#0

	ret

alternative_else_nop_endif

	b	__vhe_hyp_call

ENDPROC(__kvm_call_hyp)

arch/arm64/kvm/hyp/hyp-entry.S

+0 −12
Original line number Diff line number Diff line
@@ -43,18 +43,6 @@ 
	ldr	lr, [sp], #16

.endm



ENTRY(__vhe_hyp_call)

	do_el2_call

	/*

	 * We used to rely on having an exception return to get

	 * an implicit isb. In the E2H case, we don't have it anymore.

	 * rather than changing all the leaf functions, just do it here

	 * before returning to the rest of the kernel.

	 */

	isb

	ret

ENDPROC(__vhe_hyp_call)



el1_sync:				// Guest trapped into EL2



	mrs	x0, esr_el2

CRA Git | Maintained and supported by SUSTech CRA and CCSE