Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b51e5fa authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: Route asynchronous aborts 



As we now have some basic handling to EL1-triggered aborts, we can
actually report them to KVM.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 0215a6e6

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

+8 −3
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ el1_irq: 
	mov	x0, #ARM_EXCEPTION_IRQ

	b	__guest_exit



el1_error:

	stp     x0, x1, [sp, #-16]!

	mrs	x1, tpidr_el2

	mov	x0, #ARM_EXCEPTION_EL1_SERROR

	b	__guest_exit



ENTRY(__hyp_do_panic)

	mov	lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\

		      PSR_MODE_EL1h)
@@ -148,7 +154,6 @@ ENDPROC(\label) 
	invalid_vector	el1_sync_invalid

	invalid_vector	el1_irq_invalid

	invalid_vector	el1_fiq_invalid

	invalid_vector	el1_error_invalid



	.ltorg
@@ -168,10 +173,10 @@ ENTRY(__kvm_hyp_vector) 
	ventry	el1_sync			// Synchronous 64-bit EL1

	ventry	el1_irq				// IRQ 64-bit EL1

	ventry	el1_fiq_invalid			// FIQ 64-bit EL1

	ventry	el1_error_invalid		// Error 64-bit EL1

	ventry	el1_error			// Error 64-bit EL1



	ventry	el1_sync			// Synchronous 32-bit EL1

	ventry	el1_irq				// IRQ 32-bit EL1

	ventry	el1_fiq_invalid			// FIQ 32-bit EL1

	ventry	el1_error_invalid		// Error 32-bit EL1

	ventry	el1_error			// Error 32-bit EL1

ENDPROC(__kvm_hyp_vector)