Commit 41bd5b5d authored by James Morse's avatar James Morse Committed by Will Deacon
Browse files

arm64: Move the async/fiq helpers to explicitly set process context flags 



Remove the local_{async,fiq}_{en,dis}able macros as they don't respect
our newly defined order and are only used to set the flags for process
context when we bring CPUs online.

Add a helper to do this. The IRQ flag varies as we want it masked on
the boot CPU until we are ready to handle interrupts.
The boot CPU unmasks SError during early boot once it can print an error
message. If we can print an error message about SError, we can do the
same for FIQ. Debug exceptions are already enabled by __cpu_setup(),
which has also configured MDSCR_EL1 to disable MDE and KDE.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Reviewed-by: default avatarJulien Thierry <julien.thierry@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 65be7a1b

arch/arm64/include/asm/daifflags.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 


#include <linux/irqflags.h>



#define DAIF_PROCCTX		0

#define DAIF_PROCCTX_NOIRQ	PSR_I_BIT



/* mask/save/unmask/restore all exceptions, including interrupts. */

static inline void local_daif_mask(void)

{

arch/arm64/include/asm/irqflags.h

+0 −6
Original line number Diff line number Diff line
@@ -66,12 +66,6 @@ static inline void arch_local_irq_disable(void) 
		: "memory");

}



#define local_fiq_enable()	asm("msr	daifclr, #1" : : : "memory")

#define local_fiq_disable()	asm("msr	daifset, #1" : : : "memory")



#define local_async_enable()	asm("msr	daifclr, #4" : : : "memory")

#define local_async_disable()	asm("msr	daifset, #4" : : : "memory")



/*

 * Save the current interrupt enable state.

 */

arch/arm64/kernel/setup.c

+5 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <asm/fixmap.h>

#include <asm/cpu.h>

#include <asm/cputype.h>

#include <asm/daifflags.h>

#include <asm/elf.h>

#include <asm/cpufeature.h>

#include <asm/cpu_ops.h>
@@ -259,10 +260,11 @@ void __init setup_arch(char **cmdline_p) 
	parse_early_param();



	/*

	 *  Unmask asynchronous aborts after bringing up possible earlycon.

	 * (Report possible System Errors once we can report this occurred)

	 * Unmask asynchronous aborts and fiq after bringing up possible

	 * earlycon. (Report possible System Errors once we can report this

	 * occurred).

	 */

	local_async_enable();

	local_daif_restore(DAIF_PROCCTX_NOIRQ);



	/*

	 * TTBR0 is only used for the identity mapping at this stage. Make it

arch/arm64/kernel/smp.c

+1 −2
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ asmlinkage void secondary_start_kernel(void) 
	set_cpu_online(cpu, true);

	complete(&cpu_running);



	local_irq_enable();

	local_async_enable();

	local_daif_restore(DAIF_PROCCTX);



	/*

	 * OK, it's off to the idle thread for us

CRA Git | Maintained and supported by SUSTech CRA and CCSE