UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Morse 2017-11-02 12:12:41 +00:00 committed by Will Deacon
parent 746647c75a
commit b282e1ce29
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/include/asm/assembler.h
View File

@ -55,6 +55,11 @@
msr daif, \tmp msr daif, \tmp
.endm .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. * Enable and disable interrupts.
*/ */

4
arch/arm64/kernel/entry.S
View File

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