Commit 74501499 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Handle physical FIQ as an IRQ while running a guest 



As we we now entertain the possibility of FIQ being used on the host,
treat the signalling of a FIQ while running a guest as an IRQ,
causing an exit instead of a HYP panic.

Reviewed-by: default avatarAlexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 0e5cb777

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

+3 −3
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ el1_trap: 
	b	__guest_exit



el1_irq:

el1_fiq:

	get_vcpu_ptr	x1, x0

	mov	x0, #ARM_EXCEPTION_IRQ

	b	__guest_exit
@@ -131,7 +132,6 @@ SYM_CODE_END(\label) 
	invalid_vector	el2t_error_invalid

	invalid_vector	el2h_irq_invalid

	invalid_vector	el2h_fiq_invalid

	invalid_vector	el1_fiq_invalid



	.ltorg
@@ -179,12 +179,12 @@ SYM_CODE_START(__kvm_hyp_vector) 


	valid_vect	el1_sync		// Synchronous 64-bit EL1

	valid_vect	el1_irq			// IRQ 64-bit EL1

	invalid_vect	el1_fiq_invalid		// FIQ 64-bit EL1

	valid_vect	el1_fiq			// FIQ 64-bit EL1

	valid_vect	el1_error		// Error 64-bit EL1



	valid_vect	el1_sync		// Synchronous 32-bit EL1

	valid_vect	el1_irq			// IRQ 32-bit EL1

	invalid_vect	el1_fiq_invalid		// FIQ 32-bit EL1

	valid_vect	el1_fiq			// FIQ 32-bit EL1

	valid_vect	el1_error		// Error 32-bit EL1

SYM_CODE_END(__kvm_hyp_vector)