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

Commit 87530040 authored by Elliot Berman's avatar Elliot Berman
Browse files

Revert "arm64: Remove unused daif related functions/macros" 



This reverts commit a82785a9.
This is required for flush_cache_all to work.

Change-Id: I0c817ca02ff7f113d2058a81814b611342bc111a
Signed-off-by: default avatarElliot Berman <eberman@codeaurora.org>
parent 243513a6

arch/arm64/include/asm/assembler.h

+9 −1
Original line number Diff line number Diff line
@@ -52,8 +52,16 @@ 
	.endm



/*

 * Save/restore interrupts.

 * Enable and disable interrupts.

 */

	.macro	disable_irq

	msr	daifset, #2

	.endm



	.macro	enable_irq

	msr	daifclr, #2

	.endm



	.macro	save_and_disable_irq, flags

	mrs	\flags, daif

	msr	daifset, #2

arch/arm64/include/asm/daifflags.h

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,16 @@ static inline unsigned long local_daif_save(void) 
	return flags;

}



static inline void local_daif_unmask(void)

{

	trace_hardirqs_on();

	asm volatile(

		"msr	daifclr, #0xf		// local_daif_unmask"

		:

		:

		: "memory");

}



static inline void local_daif_restore(unsigned long flags)

{

	bool irq_disabled = flags & PSR_I_BIT;