[PATCH v3 08/20] arm64: entry.S: convert elX_irq
From: Julien Thierry <hidden>
Date: 2017-10-11 17:13:01
Also in:
kvmarm
On 05/10/17 20:18, James Morse wrote:
quoted hunk ↗ jump to hunk
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> --- arch/arm64/include/asm/assembler.h | 4 ++++ arch/arm64/kernel/entry.S | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index c2a37e2f733c..7ffb2a629dc9 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h@@ -54,6 +54,10 @@ msr daif, \tmp .endm + .macro enable_da_f + msr daifclr, #(8 | 4 | 1) + .endm +
We use this in irq entries because we are inheriting daif + we want to disable irqs while we process irqs right? I don't know if it's worth adding a comment but I find it easier to think about it like this. Otherwise, for patches 3 to 8 (I don't have any comment on 3 to 7): Reviewed-by: Julien Thierry <redacted>
quoted hunk ↗ jump to hunk
/* * Enable and disable interrupts. */diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index f7dfe5d2b1fb..df085ec003b0 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S@@ -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
-- Julien Thierry