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

Commit b282e1ce authored Nov 02, 2017 by James Morse Committed by Will Deacon Nov 02, 2017

arm64: entry.S: convert elX_irq



Following our 'dai' order, irqs should be processed with debug and
serror exceptions unmasked.

Add a helper to unmask these two, (and fiq for good measure).

Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Julien Thierry <julien.thierry@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 746647c7

arch/arm64/include/asm/assembler.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,11 @@
		msr daif, \tmp
		.endm

		/* IRQ is the lowest priority flag, unconditionally unmask the rest. */
		.macro enable_da_f
		msr daifclr, #(8 \| 4 \| 1)
		.endm

		/*
		* Enable and disable interrupts.
		*/

arch/arm64/kernel/entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ ENDPROC(el1_sync)
		.align 6
		el1_irq:
		kernel_entry 1
		enable_dbg
		enable_da_f
		#ifdef CONFIG_TRACE_IRQFLAGS
		bl trace_hardirqs_off
		#endif
		@@ -766,7 +766,7 @@ ENDPROC(el0_sync)
		el0_irq:
		kernel_entry 0
		el0_irq_naked:
		enable_dbg
		enable_da_f
		#ifdef CONFIG_TRACE_IRQFLAGS
		bl trace_hardirqs_off
		#endif