Commit e36f561a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags 

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
  Fix IRQ flag handling naming
  MIPS: Add missing #inclusions of <linux/irq.h>
  smc91x: Add missing #inclusion of <linux/irq.h>
  Drop a couple of unnecessary asm/system.h inclusions
  SH: Add missing consts to sys_execve() declaration
  Blackfin: Rename IRQ flags handling functions
  Blackfin: Add missing dep to asm/irqflags.h
  Blackfin: Rename DES PC2() symbol to avoid collision
  Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
  Blackfin: Split PLL code from mach-specific cdef headers
parents 70ada779 df9ee292

arch/alpha/include/asm/irqflags.h

0 → 100644
+67 −0
Original line number Diff line number Diff line 
#ifndef __ALPHA_IRQFLAGS_H

#define __ALPHA_IRQFLAGS_H



#include <asm/system.h>



#define IPL_MIN		0

#define IPL_SW0		1

#define IPL_SW1		2

#define IPL_DEV0	3

#define IPL_DEV1	4

#define IPL_TIMER	5

#define IPL_PERF	6

#define IPL_POWERFAIL	6

#define IPL_MCHECK	7

#define IPL_MAX		7



#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK

#undef IPL_MIN

#define IPL_MIN		__min_ipl

extern int __min_ipl;

#endif



#define getipl()		(rdps() & 7)

#define setipl(ipl)		((void) swpipl(ipl))



static inline unsigned long arch_local_save_flags(void)

{

	return rdps();

}



static inline void arch_local_irq_disable(void)

{

	setipl(IPL_MAX);

	barrier();

}



static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags = swpipl(IPL_MAX);

	barrier();

	return flags;

}



static inline void arch_local_irq_enable(void)

{

	barrier();

	setipl(IPL_MIN);

}



static inline void arch_local_irq_restore(unsigned long flags)

{

	barrier();

	setipl(flags);

	barrier();

}



static inline bool arch_irqs_disabled_flags(unsigned long flags)

{

	return flags == IPL_MAX;

}



static inline bool arch_irqs_disabled(void)

{

	return arch_irqs_disabled_flags(getipl());

}



#endif /* __ALPHA_IRQFLAGS_H */

arch/alpha/include/asm/system.h

+0 −28
Original line number Diff line number Diff line
@@ -259,34 +259,6 @@ __CALL_PAL_RW2(wrperfmon, unsigned long, unsigned long, unsigned long); 
__CALL_PAL_W1(wrusp, unsigned long);

__CALL_PAL_W1(wrvptptr, unsigned long);



#define IPL_MIN		0

#define IPL_SW0		1

#define IPL_SW1		2

#define IPL_DEV0	3

#define IPL_DEV1	4

#define IPL_TIMER	5

#define IPL_PERF	6

#define IPL_POWERFAIL	6

#define IPL_MCHECK	7

#define IPL_MAX		7



#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK

#undef IPL_MIN

#define IPL_MIN		__min_ipl

extern int __min_ipl;

#endif



#define getipl()		(rdps() & 7)

#define setipl(ipl)		((void) swpipl(ipl))



#define local_irq_disable()			do { setipl(IPL_MAX); barrier(); } while(0)

#define local_irq_enable()			do { barrier(); setipl(IPL_MIN); } while(0)

#define local_save_flags(flags)	((flags) = rdps())

#define local_irq_save(flags)	do { (flags) = swpipl(IPL_MAX); barrier(); } while(0)

#define local_irq_restore(flags)	do { barrier(); setipl(flags); barrier(); } while(0)



#define irqs_disabled()	(getipl() == IPL_MAX)



/*

 * TB routines..

 */

arch/arm/include/asm/irqflags.h

+84 −61
Original line number Diff line number Diff line
@@ -10,66 +10,85 @@ 
 */

#if __LINUX_ARM_ARCH__ >= 6



#define raw_local_irq_save(x)					\

	({							\

	__asm__ __volatile__(					\

	"mrs	%0, cpsr		@ local_irq_save\n"	\

	"cpsid	i"						\

	: "=r" (x) : : "memory", "cc");				\

	})

static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags;



	asm volatile(

		"	mrs	%0, cpsr	@ arch_local_irq_save\n"

		"	cpsid	i"

		: "=r" (flags) : : "memory", "cc");

	return flags;

}



static inline void arch_local_irq_enable(void)

{

	asm volatile(

		"	cpsie i			@ arch_local_irq_enable"

		:

		:

		: "memory", "cc");

}



static inline void arch_local_irq_disable(void)

{

	asm volatile(

		"	cpsid i			@ arch_local_irq_disable"

		:

		:

		: "memory", "cc");

}



#define raw_local_irq_enable()  __asm__("cpsie i	@ __sti" : : : "memory", "cc")

#define raw_local_irq_disable() __asm__("cpsid i	@ __cli" : : : "memory", "cc")

#define local_fiq_enable()  __asm__("cpsie f	@ __stf" : : : "memory", "cc")

#define local_fiq_disable() __asm__("cpsid f	@ __clf" : : : "memory", "cc")



#else



/*

 * Save the current interrupt enable state & disable IRQs

 */

#define raw_local_irq_save(x)					\

	({							\

		unsigned long temp;				\

		(void) (&temp == &x);				\

	__asm__ __volatile__(					\

	"mrs	%0, cpsr		@ local_irq_save\n"	\

"	orr	%1, %0, #128\n"					\

"	msr	cpsr_c, %1"					\

	: "=r" (x), "=r" (temp)					\

	:							\

	: "memory", "cc");					\

	})

static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags, temp;



	asm volatile(

		"	mrs	%0, cpsr	@ arch_local_irq_save\n"

		"	orr	%1, %0, #128\n"

		"	msr	cpsr_c, %1"

		: "=r" (flags), "=r" (temp)

		:

		: "memory", "cc");

	return flags;

}



/*

 * Enable IRQs

 */

#define raw_local_irq_enable()					\

	({							\

		unsigned long temp;				\

	__asm__ __volatile__(					\

	"mrs	%0, cpsr		@ local_irq_enable\n"	\

"	bic	%0, %0, #128\n"					\

"	msr	cpsr_c, %0"					\

	: "=r" (temp)						\

	:							\

	: "memory", "cc");					\

	})

static inline void arch_local_irq_enable(void)

{

	unsigned long temp;

	asm volatile(

		"	mrs	%0, cpsr	@ arch_local_irq_enable\n"

		"	bic	%0, %0, #128\n"

		"	msr	cpsr_c, %0"

		: "=r" (temp)

		:

		: "memory", "cc");

}



/*

 * Disable IRQs

 */

#define raw_local_irq_disable()					\

	({							\

		unsigned long temp;				\

	__asm__ __volatile__(					\

	"mrs	%0, cpsr		@ local_irq_disable\n"	\

"	orr	%0, %0, #128\n"					\

"	msr	cpsr_c, %0"					\

	: "=r" (temp)						\

	:							\

	: "memory", "cc");					\

	})

static inline void arch_local_irq_disable(void)

{

	unsigned long temp;

	asm volatile(

		"	mrs	%0, cpsr	@ arch_local_irq_disable\n"

		"	orr	%0, %0, #128\n"

		"	msr	cpsr_c, %0"

		: "=r" (temp)

		:

		: "memory", "cc");

}



/*

 * Enable FIQs
@@ -106,27 +125,31 @@ 
/*

 * Save the current interrupt enable state.

 */

#define raw_local_save_flags(x)					\

	({							\

	__asm__ __volatile__(					\

	"mrs	%0, cpsr		@ local_save_flags"	\

	: "=r" (x) : : "memory", "cc");				\

	})

static inline unsigned long arch_local_save_flags(void)

{

	unsigned long flags;

	asm volatile(

		"	mrs	%0, cpsr	@ local_save_flags"

		: "=r" (flags) : : "memory", "cc");

	return flags;

}



/*

 * restore saved IRQ & FIQ state

 */

#define raw_local_irq_restore(x)				\

	__asm__ __volatile__(					\

	"msr	cpsr_c, %0		@ local_irq_restore\n"	\

	:							\

	: "r" (x)						\

	: "memory", "cc")



#define raw_irqs_disabled_flags(flags)	\

({					\

	(int)((flags) & PSR_I_BIT);	\

})

static inline void arch_local_irq_restore(unsigned long flags)

{

	asm volatile(

		"	msr	cpsr_c, %0	@ local_irq_restore"

		:

		: "r" (flags)

		: "memory", "cc");

}



static inline int arch_irqs_disabled_flags(unsigned long flags)

{

	return flags & PSR_I_BIT;

}



#endif

#endif

arch/avr32/include/asm/irqflags.h

+11 −18
Original line number Diff line number Diff line
@@ -8,16 +8,14 @@ 
#ifndef __ASM_AVR32_IRQFLAGS_H

#define __ASM_AVR32_IRQFLAGS_H



#include <linux/types.h>

#include <asm/sysreg.h>



static inline unsigned long __raw_local_save_flags(void)

static inline unsigned long arch_local_save_flags(void)

{

	return sysreg_read(SR);

}



#define raw_local_save_flags(x)					\

	do { (x) = __raw_local_save_flags(); } while (0)



/*

 * This will restore ALL status register flags, not only the interrupt

 * mask flag.
@@ -25,44 +23,39 @@ static inline unsigned long __raw_local_save_flags(void) 
 * The empty asm statement informs the compiler of this fact while

 * also serving as a barrier.

 */

static inline void raw_local_irq_restore(unsigned long flags)

static inline void arch_local_irq_restore(unsigned long flags)

{

	sysreg_write(SR, flags);

	asm volatile("" : : : "memory", "cc");

}



static inline void raw_local_irq_disable(void)

static inline void arch_local_irq_disable(void)

{

	asm volatile("ssrf %0" : : "n"(SYSREG_GM_OFFSET) : "memory");

}



static inline void raw_local_irq_enable(void)

static inline void arch_local_irq_enable(void)

{

	asm volatile("csrf %0" : : "n"(SYSREG_GM_OFFSET) : "memory");

}



static inline int raw_irqs_disabled_flags(unsigned long flags)

static inline bool arch_irqs_disabled_flags(unsigned long flags)

{

	return (flags & SYSREG_BIT(GM)) != 0;

}



static inline int raw_irqs_disabled(void)

static inline bool arch_irqs_disabled(void)

{

	unsigned long flags = __raw_local_save_flags();



	return raw_irqs_disabled_flags(flags);

	return arch_irqs_disabled_flags(arch_local_save_flags());

}



static inline unsigned long __raw_local_irq_save(void)

static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags = __raw_local_save_flags();

	unsigned long flags = arch_local_save_flags();



	raw_local_irq_disable();

	arch_local_irq_disable();



	return flags;

}



#define raw_local_irq_save(flags)				\

	do { (flags) = __raw_local_irq_save(); } while (0)



#endif /* __ASM_AVR32_IRQFLAGS_H */

arch/blackfin/include/asm/ipipe.h

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#define prepare_arch_switch(next)		\

do {						\

	ipipe_schedule_notify(current, next);	\

	local_irq_disable_hw();			\

	hard_local_irq_disable();			\

} while (0)



#define task_hijacked(p)						\
@@ -57,7 +57,7 @@ do { \ 
		int __x__ = __ipipe_root_domain_p;			\

		__clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \

		if (__x__)						\

			local_irq_enable_hw();				\

			hard_local_irq_enable();				\

		!__x__;							\

	})
@@ -167,7 +167,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) 
#define __ipipe_run_isr(ipd, irq)					\

	do {								\

		if (!__ipipe_pipeline_head_p(ipd))			\

			local_irq_enable_hw();				\

			hard_local_irq_enable();				\

		if (ipd == ipipe_root_domain) {				\

			if (unlikely(ipipe_virtual_irq_p(irq))) {	\

				irq_enter();				\
@@ -183,7 +183,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) 
			__ipipe_run_irqtail();				\

			__set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \

		}							\

		local_irq_disable_hw();					\

		hard_local_irq_disable();					\

	} while (0)



#define __ipipe_syscall_watched_p(p, sc)	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE