Commit b020aa9d authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: cleanup hw_irq.h 



SET_MSR_EE() is just use in this file and doesn't provide
any added value compared to mtmsr(). Drop it.

Add a wrtee() inline function to use wrtee/wrteei insn.

Replace #ifdefs by IS_ENABLED()

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/a28a20514d5f6df9629c1a117b667e48c4272736.1567068137.git.christophe.leroy@c-s.fr
parent 44448640

arch/powerpc/include/asm/hw_irq.h

+26 −31
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ static inline bool arch_irqs_disabled(void) 
#endif /* CONFIG_PPC_BOOK3S */



#ifdef CONFIG_PPC_BOOK3E

#define __hard_irq_enable()	asm volatile("wrteei 1" : : : "memory")

#define __hard_irq_disable()	asm volatile("wrteei 0" : : : "memory")

#define __hard_irq_enable()	wrtee(MSR_EE)

#define __hard_irq_disable()	wrtee(0)

#else

#define __hard_irq_enable()	__mtmsrd(MSR_EE|MSR_RI, 1)

#define __hard_irq_disable()	__mtmsrd(MSR_RI, 1)
@@ -280,8 +280,6 @@ extern void force_external_irq_replay(void); 


#else /* CONFIG_PPC64 */



#define SET_MSR_EE(x)	mtmsr(x)



static inline unsigned long arch_local_save_flags(void)

{

	return mfmsr();
@@ -289,47 +287,44 @@ static inline unsigned long arch_local_save_flags(void) 


static inline void arch_local_irq_restore(unsigned long flags)

{

#if defined(CONFIG_BOOKE)

	asm volatile("wrtee %0" : : "r" (flags) : "memory");

#else

	if (IS_ENABLED(CONFIG_BOOKE))

		wrtee(flags);

	else

		mtmsr(flags);

#endif

}



static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags = arch_local_save_flags();

#ifdef CONFIG_BOOKE

	asm volatile("wrteei 0" : : : "memory");

#elif defined(CONFIG_PPC_8xx)



	if (IS_ENABLED(CONFIG_BOOKE))

		wrtee(0);

	else if (IS_ENABLED(CONFIG_PPC_8xx))

		wrtspr(SPRN_EID);

#else

	SET_MSR_EE(flags & ~MSR_EE);

#endif

	else

		mtmsr(flags & ~MSR_EE);



	return flags;

}



static inline void arch_local_irq_disable(void)

{

#ifdef CONFIG_BOOKE

	asm volatile("wrteei 0" : : : "memory");

#elif defined(CONFIG_PPC_8xx)

	if (IS_ENABLED(CONFIG_BOOKE))

		wrtee(0);

	else if (IS_ENABLED(CONFIG_PPC_8xx))

		wrtspr(SPRN_EID);

#else

	arch_local_irq_save();

#endif

	else

		mtmsr(mfmsr() & ~MSR_EE);

}



static inline void arch_local_irq_enable(void)

{

#ifdef CONFIG_BOOKE

	asm volatile("wrteei 1" : : : "memory");

#elif defined(CONFIG_PPC_8xx)

	if (IS_ENABLED(CONFIG_BOOKE))

		wrtee(MSR_EE);

	else if (IS_ENABLED(CONFIG_PPC_8xx))

		wrtspr(SPRN_EIE);

#else

	unsigned long msr = mfmsr();

	SET_MSR_EE(msr | MSR_EE);

#endif

	else

		mtmsr(mfmsr() | MSR_EE);

}



static inline bool arch_irqs_disabled_flags(unsigned long flags)

arch/powerpc/include/asm/reg.h

+8 −0
Original line number Diff line number Diff line
@@ -1368,6 +1368,14 @@ static inline void mtmsr_isync(unsigned long val) 
#define wrtspr(rn)	asm volatile("mtspr " __stringify(rn) ",0" : \

				     : : "memory")



static inline void wrtee(unsigned long val)

{

	if (__builtin_constant_p(val))

		asm volatile("wrteei %0" : : "i" ((val & MSR_EE) ? 1 : 0) : "memory");

	else

		asm volatile("wrtee %0" : : "r" (val) : "memory");

}



extern unsigned long msr_check_and_set(unsigned long bits);

extern bool strict_msr_control;

extern void __msr_check_and_clear(unsigned long bits);

CRA Git | Maintained and supported by SUSTech CRA and CCSE