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

Commit 9034f625 authored by Julien Thierry's avatar Julien Thierry Committed by Catalin Marinas
Browse files

arm64: Do not enable IRQs for ct_user_exit



For el0_dbg and el0_error, DAIF bits get explicitly cleared before
calling ct_user_exit.

When context tracking is disabled, DAIF gets set (almost) immediately
after. When context tracking is enabled, among the first things done
is disabling IRQs.

What is actually needed is:
- PSR.D = 0 so the system can be debugged (should be already the case)
- PSR.A = 0 so async error can be handled during context tracking

Do not clear PSR.I in those two locations.

Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarJames Morse <james.morse@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarJulien Thierry <julien.thierry@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 8f5c9037
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ el0_dbg:
	mov	x1, x25
	mov	x2, sp
	bl	do_debug_exception
	enable_daif
	enable_da_f
	ct_user_exit
	b	ret_to_user
el0_inv:
@@ -922,7 +922,7 @@ el0_error_naked:
	enable_dbg
	mov	x0, sp
	bl	do_serror
	enable_daif
	enable_da_f
	ct_user_exit
	b	ret_to_user
ENDPROC(el0_error)