Commit 2e680920 authored by Wei Li's avatar Wei Li Committed by Xie XiuQi
Browse files

Revert "arm64: irqflags: fix incomplete save & restore" 



hulk inclusion
category: bugfix
bugzilla: 23209
CVE: NA

-------------------------------------------------

This reverts commit f4ed436b2416 ("arm64: irqflags: fix incomplete
 save & restore").

Signed-off-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 4e5e2fd3

arch/arm64/include/asm/irqflags.h

+8 −9
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ static inline unsigned long arch_local_save_flags(void) 
	 * The asm is logically equivalent to:

	 *

	 * if (system_uses_irq_prio_masking())

	 *	flags = (daif_bits << 32) |

	 *	flags = (daif_bits & PSR_I_BIT) ?

	 *			GIC_PRIO_IRQOFF :

	 *			read_sysreg_s(SYS_ICC_PMR_EL1);

	 * else

	 *	flags = daif_bits;
@@ -86,11 +87,11 @@ static inline unsigned long arch_local_save_flags(void) 
			"nop\n"

			"nop",

			"mrs_s	%0, " __stringify(SYS_ICC_PMR_EL1) "\n"

			"lsl	%1, %1, #32\n"

			"orr	%0, %0, %1",

			"ands	%1, %1, " __stringify(PSR_I_BIT) "\n"

			"csel	%0, %0, %2, eq",

			ARM64_HAS_IRQ_PRIO_MASKING)

		: "=&r" (flags), "+r" (daif_bits)

		:

		: "r" ((unsigned long) GIC_PRIO_IRQOFF)

		: "memory");



	return flags;
@@ -118,8 +119,8 @@ static inline void arch_local_irq_restore(unsigned long flags) 
			"msr_s	" __stringify(SYS_ICC_PMR_EL1) ", %0\n"

			"dsb	sy",

			ARM64_HAS_IRQ_PRIO_MASKING)

		: "+r" (flags)

		:

		: "r" ((int)flags)

		: "memory");

}
@@ -129,14 +130,12 @@ static inline int arch_irqs_disabled_flags(unsigned long flags) 


	asm volatile(ALTERNATIVE(

			"and	%w0, %w1, #" __stringify(PSR_I_BIT) "\n"

			"nop\n"

			"nop",

			"and	%w0, %w2, #" __stringify(PSR_I_BIT) "\n"

			"cmp	%w1, #" __stringify(GIC_PRIO_IRQOFF) "\n"

			"cinc	%w0, %w0, ls",

			"cset	%w0, ls",

			ARM64_HAS_IRQ_PRIO_MASKING)

		: "=&r" (res)

		: "r" ((int) flags), "r" (flags >> 32)

		: "r" ((int) flags)

		: "memory");



	return res;