Skip to content

L
linux
Commit e36f561a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2335 additions and 1847 deletions
arch/alpha/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
#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
View file @ e36f561a
...@@ -259,34 +259,6 @@ __CALL_PAL_RW2(wrperfmon, unsigned long, unsigned long, unsigned long); ...@@ -259,34 +259,6 @@ __CALL_PAL_RW2(wrperfmon, unsigned long, unsigned long, unsigned long);
__CALL_PAL_W1(wrusp, unsigned long); __CALL_PAL_W1(wrusp, unsigned long);
__CALL_PAL_W1(wrvptptr, 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.. * TB routines..
*/ */
......
arch/arm/include/asm/irqflags.h
View file @ e36f561a
...@@ -10,66 +10,85 @@ ...@@ -10,66 +10,85 @@
*/ */
#if __LINUX_ARM_ARCH__ >= 6 #if __LINUX_ARM_ARCH__ >= 6
#define raw_local_irq_save(x) \ static inline unsigned long arch_local_irq_save(void)
({ \ {
__asm__ __volatile__( \ unsigned long flags;
"mrs %0, cpsr @ local_irq_save\n" \
"cpsid i" \ asm volatile(
: "=r" (x) : : "memory", "cc"); \ " 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_enable() __asm__("cpsie f @ __stf" : : : "memory", "cc")
#define local_fiq_disable() __asm__("cpsid f @ __clf" : : : "memory", "cc") #define local_fiq_disable() __asm__("cpsid f @ __clf" : : : "memory", "cc")
#else #else
/* /*
* Save the current interrupt enable state & disable IRQs * Save the current interrupt enable state & disable IRQs
*/ */
#define raw_local_irq_save(x) \ static inline unsigned long arch_local_irq_save(void)
({ \ {
unsigned long temp; \ unsigned long flags, temp;
(void) (&temp == &x); \
__asm__ __volatile__( \ asm volatile(
"mrs %0, cpsr @ local_irq_save\n" \ " mrs %0, cpsr @ arch_local_irq_save\n"
" orr %1, %0, #128\n" \ " orr %1, %0, #128\n"
" msr cpsr_c, %1" \ " msr cpsr_c, %1"
: "=r" (x), "=r" (temp) \ : "=r" (flags), "=r" (temp)
: \ :
: "memory", "cc"); \ : "memory", "cc");
}) return flags;
}
/* /*
* Enable IRQs * Enable IRQs
*/ */
#define raw_local_irq_enable() \ static inline void arch_local_irq_enable(void)
({ \ {
unsigned long temp; \ unsigned long temp;
__asm__ __volatile__( \ asm volatile(
"mrs %0, cpsr @ local_irq_enable\n" \ " mrs %0, cpsr @ arch_local_irq_enable\n"
" bic %0, %0, #128\n" \ " bic %0, %0, #128\n"
" msr cpsr_c, %0" \ " msr cpsr_c, %0"
: "=r" (temp) \ : "=r" (temp)
: \ :
: "memory", "cc"); \ : "memory", "cc");
}) }
/* /*
* Disable IRQs * Disable IRQs
*/ */
#define raw_local_irq_disable() \ static inline void arch_local_irq_disable(void)
({ \ {
unsigned long temp; \ unsigned long temp;
__asm__ __volatile__( \ asm volatile(
"mrs %0, cpsr @ local_irq_disable\n" \ " mrs %0, cpsr @ arch_local_irq_disable\n"
" orr %0, %0, #128\n" \ " orr %0, %0, #128\n"
" msr cpsr_c, %0" \ " msr cpsr_c, %0"
: "=r" (temp) \ : "=r" (temp)
: \ :
: "memory", "cc"); \ : "memory", "cc");
}) }
/* /*
* Enable FIQs * Enable FIQs
...@@ -106,27 +125,31 @@ ...@@ -106,27 +125,31 @@
/* /*
* Save the current interrupt enable state. * Save the current interrupt enable state.
*/ */
#define raw_local_save_flags(x) \ static inline unsigned long arch_local_save_flags(void)
({ \ {
__asm__ __volatile__( \ unsigned long flags;
"mrs %0, cpsr @ local_save_flags" \ asm volatile(
: "=r" (x) : : "memory", "cc"); \ " mrs %0, cpsr @ local_save_flags"
}) : "=r" (flags) : : "memory", "cc");
return flags;
}
/* /*
* restore saved IRQ & FIQ state * restore saved IRQ & FIQ state
*/ */
#define raw_local_irq_restore(x) \ static inline void arch_local_irq_restore(unsigned long flags)
__asm__ __volatile__( \ {
"msr cpsr_c, %0 @ local_irq_restore\n" \ asm volatile(
: \ " msr cpsr_c, %0 @ local_irq_restore"
: "r" (x) \ :
: "memory", "cc") : "r" (flags)
: "memory", "cc");
}
#define raw_irqs_disabled_flags(flags) \ static inline int arch_irqs_disabled_flags(unsigned long flags)
({ \ {
(int)((flags) & PSR_I_BIT); \ return flags & PSR_I_BIT;
}) }
#endif #endif
#endif #endif
arch/avr32/include/asm/irqflags.h
View file @ e36f561a
...@@ -8,16 +8,14 @@ ...@@ -8,16 +8,14 @@
#ifndef __ASM_AVR32_IRQFLAGS_H #ifndef __ASM_AVR32_IRQFLAGS_H
#define __ASM_AVR32_IRQFLAGS_H #define __ASM_AVR32_IRQFLAGS_H
#include <linux/types.h>
#include <asm/sysreg.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); 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 * This will restore ALL status register flags, not only the interrupt
* mask flag. * mask flag.
...@@ -25,44 +23,39 @@ static inline unsigned long __raw_local_save_flags(void) ...@@ -25,44 +23,39 @@ static inline unsigned long __raw_local_save_flags(void)
* The empty asm statement informs the compiler of this fact while * The empty asm statement informs the compiler of this fact while
* also serving as a barrier. * 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); sysreg_write(SR, flags);
asm volatile("" : : : "memory", "cc"); 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"); 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"); 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; 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 arch_irqs_disabled_flags(arch_local_save_flags());
return raw_irqs_disabled_flags(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; return flags;
} }
#define raw_local_irq_save(flags) \
do { (flags) = __raw_local_irq_save(); } while (0)
#endif /* __ASM_AVR32_IRQFLAGS_H */ #endif /* __ASM_AVR32_IRQFLAGS_H */
arch/blackfin/include/asm/ipipe.h
View file @ e36f561a
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#define prepare_arch_switch(next) \ #define prepare_arch_switch(next) \
do { \ do { \
ipipe_schedule_notify(current, next); \ ipipe_schedule_notify(current, next); \
local_irq_disable_hw(); \ hard_local_irq_disable(); \
} while (0) } while (0)
#define task_hijacked(p) \ #define task_hijacked(p) \
...@@ -57,7 +57,7 @@ do { \ ...@@ -57,7 +57,7 @@ do { \
int __x__ = __ipipe_root_domain_p; \ int __x__ = __ipipe_root_domain_p; \
__clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \ __clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \
if (__x__) \ if (__x__) \
local_irq_enable_hw(); \ hard_local_irq_enable(); \
!__x__; \ !__x__; \
}) })
...@@ -167,7 +167,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) ...@@ -167,7 +167,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul)
#define __ipipe_run_isr(ipd, irq) \ #define __ipipe_run_isr(ipd, irq) \
do { \ do { \
if (!__ipipe_pipeline_head_p(ipd)) \ if (!__ipipe_pipeline_head_p(ipd)) \
local_irq_enable_hw(); \ hard_local_irq_enable(); \
if (ipd == ipipe_root_domain) { \ if (ipd == ipipe_root_domain) { \
if (unlikely(ipipe_virtual_irq_p(irq))) { \ if (unlikely(ipipe_virtual_irq_p(irq))) { \
irq_enter(); \ irq_enter(); \
...@@ -183,7 +183,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) ...@@ -183,7 +183,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul)
__ipipe_run_irqtail(); \ __ipipe_run_irqtail(); \
__set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \ __set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \
} \ } \
local_irq_disable_hw(); \ hard_local_irq_disable(); \
} while (0) } while (0)
#define __ipipe_syscall_watched_p(p, sc) \ #define __ipipe_syscall_watched_p(p, sc) \
......
arch/blackfin/include/asm/irqflags.h
View file @ e36f561a
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef __ASM_BFIN_IRQFLAGS_H__ #ifndef __ASM_BFIN_IRQFLAGS_H__
#define __ASM_BFIN_IRQFLAGS_H__ #define __ASM_BFIN_IRQFLAGS_H__
#include <mach/blackfin.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
# include <asm/pda.h> # include <asm/pda.h>
# include <asm/processor.h> # include <asm/processor.h>
...@@ -31,54 +33,108 @@ static inline unsigned long bfin_cli(void) ...@@ -31,54 +33,108 @@ static inline unsigned long bfin_cli(void)
return flags; return flags;
} }
#ifdef CONFIG_IPIPE
#include <linux/compiler.h>
#include <linux/ipipe_base.h>
#include <linux/ipipe_trace.h>
#ifdef CONFIG_DEBUG_HWERR #ifdef CONFIG_DEBUG_HWERR
# define bfin_no_irqs 0x3f # define bfin_no_irqs 0x3f
#else #else
# define bfin_no_irqs 0x1f # define bfin_no_irqs 0x1f
#endif #endif
#define raw_local_irq_disable() \ /*****************************************************************************/
do { \ /*
ipipe_check_context(ipipe_root_domain); \ * Hard, untraced CPU interrupt flag manipulation and access.
__ipipe_stall_root(); \ */
barrier(); \ static inline void __hard_local_irq_disable(void)
} while (0) {
bfin_cli();
}
static inline void __hard_local_irq_enable(void)
{
bfin_sti(bfin_irq_flags);
}
static inline unsigned long hard_local_save_flags(void)
{
return bfin_read_IMASK();
}
#define raw_local_irq_enable() \ static inline unsigned long __hard_local_irq_save(void)
do { \ {
barrier(); \ unsigned long flags;
ipipe_check_context(ipipe_root_domain); \ flags = bfin_cli();
__ipipe_unstall_root(); \ #ifdef CONFIG_DEBUG_HWERR
} while (0) bfin_sti(0x3f);
#endif
return flags;
}
static inline int hard_irqs_disabled_flags(unsigned long flags)
{
return (flags & ~0x3f) == 0;
}
static inline int hard_irqs_disabled(void)
{
unsigned long flags = hard_local_save_flags();
return hard_irqs_disabled_flags(flags);
}
static inline void __hard_local_irq_restore(unsigned long flags)
{
if (!hard_irqs_disabled_flags(flags))
__hard_local_irq_enable();
}
/*****************************************************************************/
/*
* Interrupt pipe handling.
*/
#ifdef CONFIG_IPIPE
#include <linux/compiler.h>
#include <linux/ipipe_base.h>
#include <linux/ipipe_trace.h>
/*
* Interrupt pipe interface to linux/irqflags.h.
*/
static inline void arch_local_irq_disable(void)
{
ipipe_check_context(ipipe_root_domain);
__ipipe_stall_root();
barrier();
}
#define raw_local_save_flags_ptr(x) \ static inline void arch_local_irq_enable(void)
do { \ {
*(x) = __ipipe_test_root() ? bfin_no_irqs : bfin_irq_flags; \ barrier();
} while (0) ipipe_check_context(ipipe_root_domain);
__ipipe_unstall_root();
}
#define raw_local_save_flags(x) raw_local_save_flags_ptr(&(x)) static inline unsigned long arch_local_save_flags(void)
{
return __ipipe_test_root() ? bfin_no_irqs : bfin_irq_flags;
}
#define raw_irqs_disabled_flags(x) ((x) == bfin_no_irqs) static inline int arch_irqs_disabled_flags(unsigned long flags)
{
return flags == bfin_no_irqs;
}
#define raw_local_irq_save_ptr(x) \ static inline void arch_local_irq_save_ptr(unsigned long *_flags)
do { \ {
*(x) = __ipipe_test_and_stall_root() ? bfin_no_irqs : bfin_irq_flags; \ x = __ipipe_test_and_stall_root() ? bfin_no_irqs : bfin_irq_flags;
barrier(); \ barrier();
} while (0) }
#define raw_local_irq_save(x) \ static inline unsigned long arch_local_irq_save(void)
do { \ {
ipipe_check_context(ipipe_root_domain); \ ipipe_check_context(ipipe_root_domain);
raw_local_irq_save_ptr(&(x)); \ return __hard_local_irq_save();
} while (0) }
static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real) static inline unsigned long arch_mangle_irq_bits(int virt, unsigned long real)
{ {
/* /*
* Merge virtual and real interrupt mask bits into a single * Merge virtual and real interrupt mask bits into a single
...@@ -87,130 +143,79 @@ static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real) ...@@ -87,130 +143,79 @@ static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real)
return (real & ~(1 << 31)) | ((virt != 0) << 31); return (real & ~(1 << 31)) | ((virt != 0) << 31);
} }
static inline int raw_demangle_irq_bits(unsigned long *x) static inline int arch_demangle_irq_bits(unsigned long *x)
{ {
int virt = (*x & (1 << 31)) != 0; int virt = (*x & (1 << 31)) != 0;
*x &= ~(1L << 31); *x &= ~(1L << 31);
return virt; return virt;
} }
static inline void local_irq_disable_hw_notrace(void) /*
* Interface to various arch routines that may be traced.
*/
#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
static inline void hard_local_irq_disable(void)
{ {
bfin_cli(); if (!hard_irqs_disabled()) {
__hard_local_irq_disable();
ipipe_trace_begin(0x80000000);
}
} }
static inline void local_irq_enable_hw_notrace(void) static inline void hard_local_irq_enable(void)
{ {
bfin_sti(bfin_irq_flags); if (hard_irqs_disabled()) {
ipipe_trace_end(0x80000000);
__hard_local_irq_enable();
}
} }
#define local_save_flags_hw(flags) \ static inline unsigned long hard_local_irq_save(void)
do { \
(flags) = bfin_read_IMASK(); \
} while (0)
#define irqs_disabled_flags_hw(flags) (((flags) & ~0x3f) == 0)
#define irqs_disabled_hw() \
({ \
unsigned long flags; \
local_save_flags_hw(flags); \
irqs_disabled_flags_hw(flags); \
})
static inline void local_irq_save_ptr_hw(unsigned long *flags)
{ {
*flags = bfin_cli(); unsigned long flags = hard_local_save_flags();
#ifdef CONFIG_DEBUG_HWERR if (!hard_irqs_disabled_flags(flags)) {
bfin_sti(0x3f); __hard_local_irq_disable();
#endif ipipe_trace_begin(0x80000001);
}
return flags;
} }
#define local_irq_save_hw_notrace(flags) \ static inline void hard_local_irq_restore(unsigned long flags)
do { \
local_irq_save_ptr_hw(&(flags)); \
} while (0)
static inline void local_irq_restore_hw_notrace(unsigned long flags)
{ {
if (!irqs_disabled_flags_hw(flags)) if (!hard_irqs_disabled_flags(flags)) {
local_irq_enable_hw_notrace(); ipipe_trace_end(0x80000001);
__hard_local_irq_enable();
}
} }
#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
# define local_irq_disable_hw() \
do { \
if (!irqs_disabled_hw()) { \
local_irq_disable_hw_notrace(); \
ipipe_trace_begin(0x80000000); \
} \
} while (0)
# define local_irq_enable_hw() \
do { \
if (irqs_disabled_hw()) { \
ipipe_trace_end(0x80000000); \
local_irq_enable_hw_notrace(); \
} \
} while (0)
# define local_irq_save_hw(flags) \
do { \
local_save_flags_hw(flags); \
if (!irqs_disabled_flags_hw(flags)) { \
local_irq_disable_hw_notrace(); \
ipipe_trace_begin(0x80000001); \
} \
} while (0)
# define local_irq_restore_hw(flags) \
do { \
if (!irqs_disabled_flags_hw(flags)) { \
ipipe_trace_end(0x80000001); \
local_irq_enable_hw_notrace(); \
} \
} while (0)
#else /* !CONFIG_IPIPE_TRACE_IRQSOFF */ #else /* !CONFIG_IPIPE_TRACE_IRQSOFF */
# define local_irq_disable_hw() local_irq_disable_hw_notrace() # define hard_local_irq_disable() __hard_local_irq_disable()
# define local_irq_enable_hw() local_irq_enable_hw_notrace() # define hard_local_irq_enable() __hard_local_irq_enable()
# define local_irq_save_hw(flags) local_irq_save_hw_notrace(flags) # define hard_local_irq_save() __hard_local_irq_save()
# define local_irq_restore_hw(flags) local_irq_restore_hw_notrace(flags) # define hard_local_irq_restore(flags) __hard_local_irq_restore(flags)
#endif /* !CONFIG_IPIPE_TRACE_IRQSOFF */ #endif /* !CONFIG_IPIPE_TRACE_IRQSOFF */
#else /* CONFIG_IPIPE */ #else /* CONFIG_IPIPE */
static inline void raw_local_irq_disable(void) /*
{ * Direct interface to linux/irqflags.h.
bfin_cli(); */
} #define arch_local_save_flags() hard_local_save_flags()
static inline void raw_local_irq_enable(void) #define arch_local_irq_save(flags) __hard_local_irq_save()
{ #define arch_local_irq_restore(flags) __hard_local_irq_restore(flags)
bfin_sti(bfin_irq_flags); #define arch_local_irq_enable() __hard_local_irq_enable()
} #define arch_local_irq_disable() __hard_local_irq_disable()
#define arch_irqs_disabled_flags(flags) hard_irqs_disabled_flags(flags)
#define raw_local_save_flags(flags) do { (flags) = bfin_read_IMASK(); } while (0) #define arch_irqs_disabled() hard_irqs_disabled()
#define raw_irqs_disabled_flags(flags) (((flags) & ~0x3f) == 0)
static inline unsigned long __raw_local_irq_save(void) /*
{ * Interface to various arch routines that may be traced.
unsigned long flags = bfin_cli(); */
#ifdef CONFIG_DEBUG_HWERR #define hard_local_irq_save() __hard_local_irq_save()
bfin_sti(0x3f); #define hard_local_irq_restore(flags) __hard_local_irq_restore(flags)
#endif #define hard_local_irq_enable() __hard_local_irq_enable()
return flags; #define hard_local_irq_disable() __hard_local_irq_disable()
}
#define raw_local_irq_save(flags) do { (flags) = __raw_local_irq_save(); } while (0)
#define local_irq_save_hw(flags) raw_local_irq_save(flags)
#define local_irq_restore_hw(flags) raw_local_irq_restore(flags)
#define local_irq_enable_hw() raw_local_irq_enable()
#define local_irq_disable_hw() raw_local_irq_disable()
#define irqs_disabled_hw() irqs_disabled()
#endif /* !CONFIG_IPIPE */ #endif /* !CONFIG_IPIPE */
static inline void raw_local_irq_restore(unsigned long flags)
{
if (!raw_irqs_disabled_flags(flags))
raw_local_irq_enable();
}
#endif #endif
arch/blackfin/include/asm/mmu_context.h
View file @ e36f561a
...@@ -97,8 +97,8 @@ static inline void __switch_mm(struct mm_struct *prev_mm, struct mm_struct *next ...@@ -97,8 +97,8 @@ static inline void __switch_mm(struct mm_struct *prev_mm, struct mm_struct *next
} }
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
#define lock_mm_switch(flags) local_irq_save_hw_cond(flags) #define lock_mm_switch(flags) flags = hard_local_irq_save_cond()
#define unlock_mm_switch(flags) local_irq_restore_hw_cond(flags) #define unlock_mm_switch(flags) hard_local_irq_restore_cond(flags)
#else #else
#define lock_mm_switch(flags) do { (void)(flags); } while (0) #define lock_mm_switch(flags) do { (void)(flags); } while (0)
#define unlock_mm_switch(flags) do { (void)(flags); } while (0) #define unlock_mm_switch(flags) do { (void)(flags); } while (0)
...@@ -205,9 +205,9 @@ static inline void destroy_context(struct mm_struct *mm) ...@@ -205,9 +205,9 @@ static inline void destroy_context(struct mm_struct *mm)
} }
#define ipipe_mm_switch_protect(flags) \ #define ipipe_mm_switch_protect(flags) \
local_irq_save_hw_cond(flags) flags = hard_local_irq_save_cond()
#define ipipe_mm_switch_unprotect(flags) \ #define ipipe_mm_switch_unprotect(flags) \
local_irq_restore_hw_cond(flags) hard_local_irq_restore_cond(flags)
#endif #endif
arch/blackfin/include/asm/system.h
View file @ e36f561a
...@@ -117,7 +117,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, ...@@ -117,7 +117,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
unsigned long tmp = 0; unsigned long tmp = 0;
unsigned long flags; unsigned long flags;
local_irq_save_hw(flags); flags = hard_local_irq_save();
switch (size) { switch (size) {
case 1: case 1:
...@@ -139,7 +139,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, ...@@ -139,7 +139,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory"); : "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
break; break;
} }
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
return tmp; return tmp;
} }
......
arch/blackfin/kernel/bfin_gpio.c
View file @ e36f561a
This diff is collapsed.
arch/blackfin/kernel/cplb-mpu/cplbmgr.c
View file @ e36f561a
...@@ -318,7 +318,7 @@ void flush_switched_cplbs(unsigned int cpu) ...@@ -318,7 +318,7 @@ void flush_switched_cplbs(unsigned int cpu)
nr_cplb_flush[cpu]++; nr_cplb_flush[cpu]++;
local_irq_save_hw(flags); flags = hard_local_irq_save();
_disable_icplb(); _disable_icplb();
for (i = first_switched_icplb; i < MAX_CPLBS; i++) { for (i = first_switched_icplb; i < MAX_CPLBS; i++) {
icplb_tbl[cpu][i].data = 0; icplb_tbl[cpu][i].data = 0;
...@@ -332,7 +332,7 @@ void flush_switched_cplbs(unsigned int cpu) ...@@ -332,7 +332,7 @@ void flush_switched_cplbs(unsigned int cpu)
bfin_write32(DCPLB_DATA0 + i * 4, 0); bfin_write32(DCPLB_DATA0 + i * 4, 0);
} }
_enable_dcplb(); _enable_dcplb();
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
...@@ -348,7 +348,7 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu) ...@@ -348,7 +348,7 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
return; return;
} }
local_irq_save_hw(flags); flags = hard_local_irq_save();
current_rwx_mask[cpu] = masks; current_rwx_mask[cpu] = masks;
if (L2_LENGTH && addr >= L2_START && addr < L2_START + L2_LENGTH) { if (L2_LENGTH && addr >= L2_START && addr < L2_START + L2_LENGTH) {
...@@ -373,5 +373,5 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu) ...@@ -373,5 +373,5 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
addr += PAGE_SIZE; addr += PAGE_SIZE;
} }
_enable_dcplb(); _enable_dcplb();
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
arch/blackfin/kernel/ipipe.c
View file @ e36f561a
...@@ -219,10 +219,10 @@ int __ipipe_syscall_root(struct pt_regs *regs) ...@@ -219,10 +219,10 @@ int __ipipe_syscall_root(struct pt_regs *regs)
ret = __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs); ret = __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs);
local_irq_save_hw(flags); flags = hard_local_irq_save();
if (!__ipipe_root_domain_p) { if (!__ipipe_root_domain_p) {
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
return 1; return 1;
} }
...@@ -230,7 +230,7 @@ int __ipipe_syscall_root(struct pt_regs *regs) ...@@ -230,7 +230,7 @@ int __ipipe_syscall_root(struct pt_regs *regs)
if ((p->irqpend_himask & IPIPE_IRQMASK_VIRT) != 0) if ((p->irqpend_himask & IPIPE_IRQMASK_VIRT) != 0)
__ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT); __ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
return -ret; return -ret;
} }
...@@ -239,14 +239,14 @@ unsigned long ipipe_critical_enter(void (*syncfn) (void)) ...@@ -239,14 +239,14 @@ unsigned long ipipe_critical_enter(void (*syncfn) (void))
{ {
unsigned long flags; unsigned long flags;
local_irq_save_hw(flags); flags = hard_local_irq_save();
return flags; return flags;
} }
void ipipe_critical_exit(unsigned long flags) void ipipe_critical_exit(unsigned long flags)
{ {
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
static void __ipipe_no_irqtail(void) static void __ipipe_no_irqtail(void)
...@@ -279,9 +279,9 @@ int ipipe_trigger_irq(unsigned irq) ...@@ -279,9 +279,9 @@ int ipipe_trigger_irq(unsigned irq)
return -EINVAL; return -EINVAL;
#endif #endif
local_irq_save_hw(flags); flags = hard_local_irq_save();
__ipipe_handle_irq(irq, NULL); __ipipe_handle_irq(irq, NULL);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
return 1; return 1;
} }
...@@ -293,7 +293,7 @@ asmlinkage void __ipipe_sync_root(void) ...@@ -293,7 +293,7 @@ asmlinkage void __ipipe_sync_root(void)
BUG_ON(irqs_disabled()); BUG_ON(irqs_disabled());
local_irq_save_hw(flags); flags = hard_local_irq_save();
if (irq_tail_hook) if (irq_tail_hook)
irq_tail_hook(); irq_tail_hook();
...@@ -303,7 +303,7 @@ asmlinkage void __ipipe_sync_root(void) ...@@ -303,7 +303,7 @@ asmlinkage void __ipipe_sync_root(void)
if (ipipe_root_cpudom_var(irqpend_himask) != 0) if (ipipe_root_cpudom_var(irqpend_himask) != 0)
__ipipe_sync_pipeline(IPIPE_IRQMASK_ANY); __ipipe_sync_pipeline(IPIPE_IRQMASK_ANY);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
void ___ipipe_sync_pipeline(unsigned long syncmask) void ___ipipe_sync_pipeline(unsigned long syncmask)
...@@ -344,10 +344,10 @@ void __ipipe_stall_root(void) ...@@ -344,10 +344,10 @@ void __ipipe_stall_root(void)
{ {
unsigned long *p, flags; unsigned long *p, flags;
local_irq_save_hw(flags); flags = hard_local_irq_save();
p = &__ipipe_root_status; p = &__ipipe_root_status;
__set_bit(IPIPE_STALL_FLAG, p); __set_bit(IPIPE_STALL_FLAG, p);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
EXPORT_SYMBOL(__ipipe_stall_root); EXPORT_SYMBOL(__ipipe_stall_root);
...@@ -356,10 +356,10 @@ unsigned long __ipipe_test_and_stall_root(void) ...@@ -356,10 +356,10 @@ unsigned long __ipipe_test_and_stall_root(void)
unsigned long *p, flags; unsigned long *p, flags;
int x; int x;
local_irq_save_hw(flags); flags = hard_local_irq_save();
p = &__ipipe_root_status; p = &__ipipe_root_status;
x = __test_and_set_bit(IPIPE_STALL_FLAG, p); x = __test_and_set_bit(IPIPE_STALL_FLAG, p);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
return x; return x;
} }
...@@ -371,10 +371,10 @@ unsigned long __ipipe_test_root(void) ...@@ -371,10 +371,10 @@ unsigned long __ipipe_test_root(void)
unsigned long flags; unsigned long flags;
int x; int x;
local_irq_save_hw_smp(flags); flags = hard_local_irq_save_smp();
p = &__ipipe_root_status; p = &__ipipe_root_status;
x = test_bit(IPIPE_STALL_FLAG, p); x = test_bit(IPIPE_STALL_FLAG, p);
local_irq_restore_hw_smp(flags); hard_local_irq_restore_smp(flags);
return x; return x;
} }
...@@ -384,10 +384,10 @@ void __ipipe_lock_root(void) ...@@ -384,10 +384,10 @@ void __ipipe_lock_root(void)
{ {
unsigned long *p, flags; unsigned long *p, flags;
local_irq_save_hw(flags); flags = hard_local_irq_save();
p = &__ipipe_root_status; p = &__ipipe_root_status;
__set_bit(IPIPE_SYNCDEFER_FLAG, p); __set_bit(IPIPE_SYNCDEFER_FLAG, p);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
EXPORT_SYMBOL(__ipipe_lock_root); EXPORT_SYMBOL(__ipipe_lock_root);
...@@ -395,9 +395,9 @@ void __ipipe_unlock_root(void) ...@@ -395,9 +395,9 @@ void __ipipe_unlock_root(void)
{ {
unsigned long *p, flags; unsigned long *p, flags;
local_irq_save_hw(flags); flags = hard_local_irq_save();
p = &__ipipe_root_status; p = &__ipipe_root_status;
__clear_bit(IPIPE_SYNCDEFER_FLAG, p); __clear_bit(IPIPE_SYNCDEFER_FLAG, p);
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
EXPORT_SYMBOL(__ipipe_unlock_root); EXPORT_SYMBOL(__ipipe_unlock_root);
arch/blackfin/kernel/process.c
View file @ e36f561a
...@@ -65,11 +65,11 @@ static void default_idle(void) ...@@ -65,11 +65,11 @@ static void default_idle(void)
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
ipipe_suspend_domain(); ipipe_suspend_domain();
#endif #endif
local_irq_disable_hw(); hard_local_irq_disable();
if (!need_resched()) if (!need_resched())
idle_with_irq_disabled(); idle_with_irq_disabled();
local_irq_enable_hw(); hard_local_irq_enable();
} }
/* /*
......
arch/blackfin/kernel/trace.c
View file @ e36f561a
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/trace.h> #include <asm/trace.h>
#include <asm/fixed_code.h> #include <asm/fixed_code.h>
......
arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
View file @ e36f561a
...@@ -1058,54 +1058,4 @@ ...@@ -1058,54 +1058,4 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
local_irq_restore_hw(flags);
}
#endif /* _CDEF_BF52X_H */ #endif /* _CDEF_BF52X_H */
arch/blackfin/mach-bf518/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2008 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
View file @ e36f561a
...@@ -1110,54 +1110,4 @@ ...@@ -1110,54 +1110,4 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
local_irq_restore_hw(flags);
}
#endif /* _CDEF_BF52X_H */ #endif /* _CDEF_BF52X_H */
arch/blackfin/mach-bf527/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2007-2008 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-bf533/boards/blackstamp.c
View file @ e36f561a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h> #include <asm/portmux.h>
#include <asm/dpmc.h> #include <asm/dpmc.h>
#include <mach/fio_flag.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
......
arch/blackfin/mach-bf533/boards/ip0x.c
View file @ e36f561a
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h> #include <asm/portmux.h>
#include <mach/fio_flag.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
......
arch/blackfin/mach-bf533/boards/stamp.c
View file @ e36f561a
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/portmux.h> #include <asm/portmux.h>
#include <asm/dpmc.h> #include <asm/dpmc.h>
#include <mach/fio_flag.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
......
arch/blackfin/mach-bf533/include/mach/cdefBF532.h
View file @ e36f561a
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
#ifndef _CDEF_BF532_H #ifndef _CDEF_BF532_H
#define _CDEF_BF532_H #define _CDEF_BF532_H
#include <asm/blackfin.h>
/*include all Core registers and bit definitions*/
#include "defBF532.h"
/*include core specific register pointer definitions*/ /*include core specific register pointer definitions*/
#include <asm/cdef_LPBlackfin.h> #include <asm/cdef_LPBlackfin.h>
...@@ -655,90 +650,4 @@ ...@@ -655,90 +650,4 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
#if ANOMALY_05000311
#define BFIN_WRITE_FIO_FLAG(name) \
static inline void bfin_write_FIO_FLAG_##name(unsigned short val) \
{ \
unsigned long flags; \
local_irq_save_hw(flags); \
bfin_write16(FIO_FLAG_##name, val); \
bfin_read_CHIPID(); \
local_irq_restore_hw(flags); \
}
BFIN_WRITE_FIO_FLAG(D)
BFIN_WRITE_FIO_FLAG(C)
BFIN_WRITE_FIO_FLAG(S)
BFIN_WRITE_FIO_FLAG(T)
#define BFIN_READ_FIO_FLAG(name) \
static inline u16 bfin_read_FIO_FLAG_##name(void) \
{ \
unsigned long flags; \
u16 ret; \
local_irq_save_hw(flags); \
ret = bfin_read16(FIO_FLAG_##name); \
bfin_read_CHIPID(); \
local_irq_restore_hw(flags); \
return ret; \
}
BFIN_READ_FIO_FLAG(D)
BFIN_READ_FIO_FLAG(C)
BFIN_READ_FIO_FLAG(S)
BFIN_READ_FIO_FLAG(T)
#else
#define bfin_write_FIO_FLAG_D(val) bfin_write16(FIO_FLAG_D, val)
#define bfin_write_FIO_FLAG_C(val) bfin_write16(FIO_FLAG_C, val)
#define bfin_write_FIO_FLAG_S(val) bfin_write16(FIO_FLAG_S, val)
#define bfin_write_FIO_FLAG_T(val) bfin_write16(FIO_FLAG_T, val)
#define bfin_read_FIO_FLAG_T() bfin_read16(FIO_FLAG_T)
#define bfin_read_FIO_FLAG_C() bfin_read16(FIO_FLAG_C)
#define bfin_read_FIO_FLAG_S() bfin_read16(FIO_FLAG_S)
#define bfin_read_FIO_FLAG_D() bfin_read16(FIO_FLAG_D)
#endif
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
local_irq_restore_hw(flags);
}
#endif /* _CDEF_BF532_H */ #endif /* _CDEF_BF532_H */
arch/blackfin/mach-bf533/include/mach/fio_flag.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2005-2008 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
#ifndef _MACH_FIO_FLAG_H
#define _MACH_FIO_FLAG_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
#if ANOMALY_05000311
#define BFIN_WRITE_FIO_FLAG(name) \
static inline void bfin_write_FIO_FLAG_##name(unsigned short val) \
{ \
unsigned long flags; \
flags = hard_local_irq_save(); \
bfin_write16(FIO_FLAG_##name, val); \
bfin_read_CHIPID(); \
hard_local_irq_restore(flags); \
}
BFIN_WRITE_FIO_FLAG(D)
BFIN_WRITE_FIO_FLAG(C)
BFIN_WRITE_FIO_FLAG(S)
BFIN_WRITE_FIO_FLAG(T)
#define BFIN_READ_FIO_FLAG(name) \
static inline u16 bfin_read_FIO_FLAG_##name(void) \
{ \
unsigned long flags; \
u16 ret; \
flags = hard_local_irq_save(); \
ret = bfin_read16(FIO_FLAG_##name); \
bfin_read_CHIPID(); \
hard_local_irq_restore(flags); \
return ret; \
}
BFIN_READ_FIO_FLAG(D)
BFIN_READ_FIO_FLAG(C)
BFIN_READ_FIO_FLAG(S)
BFIN_READ_FIO_FLAG(T)
#else
#define bfin_write_FIO_FLAG_D(val) bfin_write16(FIO_FLAG_D, val)
#define bfin_write_FIO_FLAG_C(val) bfin_write16(FIO_FLAG_C, val)
#define bfin_write_FIO_FLAG_S(val) bfin_write16(FIO_FLAG_S, val)
#define bfin_write_FIO_FLAG_T(val) bfin_write16(FIO_FLAG_T, val)
#define bfin_read_FIO_FLAG_T() bfin_read16(FIO_FLAG_T)
#define bfin_read_FIO_FLAG_C() bfin_read16(FIO_FLAG_C)
#define bfin_read_FIO_FLAG_S() bfin_read16(FIO_FLAG_S)
#define bfin_read_FIO_FLAG_D() bfin_read16(FIO_FLAG_D)
#endif
#endif /* _MACH_FIO_FLAG_H */
arch/blackfin/mach-bf533/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2005-2008 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-bf537/include/mach/cdefBF534.h
View file @ e36f561a
...@@ -1750,48 +1750,4 @@ ...@@ -1750,48 +1750,4 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
local_irq_restore_hw(flags);
}
#endif /* _CDEF_BF534_H */ #endif /* _CDEF_BF534_H */
arch/blackfin/mach-bf537/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2005-2008 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr = bfin_read32(SIC_IWR);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR, IWR_ENABLE(0));
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR, iwr);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-bf538/include/mach/cdefBF538.h
View file @ e36f561a
...@@ -2027,54 +2027,4 @@ ...@@ -2027,54 +2027,4 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
local_irq_restore_hw(flags);
}
#endif #endif
arch/blackfin/mach-bf538/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2008-2009 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
View file @ e36f561a
...@@ -2648,61 +2648,5 @@ ...@@ -2648,61 +2648,5 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1, iwr2;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
iwr2 = bfin_read32(SIC_IWR2);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write32(SIC_IWR2, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
bfin_write32(SIC_IWR2, iwr2);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1, iwr2;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
iwr2 = bfin_read32(SIC_IWR2);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write32(SIC_IWR2, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
bfin_write32(SIC_IWR2, iwr2);
local_irq_restore_hw(flags);
}
#endif /* _CDEF_BF54X_H */ #endif /* _CDEF_BF54X_H */
arch/blackfin/mach-bf548/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2007-2008 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1, iwr2;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
iwr2 = bfin_read32(SIC_IWR2);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write32(SIC_IWR2, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
bfin_write32(SIC_IWR2, iwr2);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1, iwr2;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SIC_IWR1);
iwr2 = bfin_read32(SIC_IWR2);
/* Only allow PPL Wakeup) */
bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SIC_IWR1, 0);
bfin_write32(SIC_IWR2, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SIC_IWR1, iwr1);
bfin_write32(SIC_IWR2, iwr2);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-bf561/include/mach/cdefBF561.h
View file @ e36f561a
...@@ -1534,54 +1534,4 @@ ...@@ -1534,54 +1534,4 @@
/* These need to be last due to the cdef/linux inter-dependencies */ /* These need to be last due to the cdef/linux inter-dependencies */
#include <asm/irq.h> #include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SICA_IWR0);
iwr1 = bfin_read32(SICA_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SICA_IWR0, IWR_ENABLE(0));
bfin_write32(SICA_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SICA_IWR0, iwr0);
bfin_write32(SICA_IWR1, iwr1);
local_irq_restore_hw(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SICA_IWR0);
iwr1 = bfin_read32(SICA_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SICA_IWR0, IWR_ENABLE(0));
bfin_write32(SICA_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SICA_IWR0, iwr0);
bfin_write32(SICA_IWR1, iwr1);
local_irq_restore_hw(flags);
}
#endif /* _CDEF_BF561_H */ #endif /* _CDEF_BF561_H */
arch/blackfin/mach-bf561/include/mach/pll.h 0 → 100644
View file @ e36f561a
/*
* Copyright 2005-2009 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#ifndef _MACH_PLL_H
#define _MACH_PLL_H
#include <asm/blackfin.h>
#include <asm/irqflags.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_PLL_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SICA_IWR0);
iwr1 = bfin_read32(SICA_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SICA_IWR0, IWR_ENABLE(0));
bfin_write32(SICA_IWR1, 0);
bfin_write16(PLL_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SICA_IWR0, iwr0);
bfin_write32(SICA_IWR1, iwr1);
hard_local_irq_restore(flags);
}
/* Writing to VR_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_VR_CTL(unsigned int val)
{
unsigned long flags, iwr0, iwr1;
if (val == bfin_read_VR_CTL())
return;
flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SICA_IWR0);
iwr1 = bfin_read32(SICA_IWR1);
/* Only allow PPL Wakeup) */
bfin_write32(SICA_IWR0, IWR_ENABLE(0));
bfin_write32(SICA_IWR1, 0);
bfin_write16(VR_CTL, val);
SSYNC();
asm("IDLE;");
bfin_write32(SICA_IWR0, iwr0);
bfin_write32(SICA_IWR1, iwr1);
hard_local_irq_restore(flags);
}
#endif /* _MACH_PLL_H */
arch/blackfin/mach-common/cpufreq.c
View file @ e36f561a
...@@ -134,7 +134,7 @@ static int bfin_target(struct cpufreq_policy *poli, ...@@ -134,7 +134,7 @@ static int bfin_target(struct cpufreq_policy *poli,
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
if (cpu == CPUFREQ_CPU) { if (cpu == CPUFREQ_CPU) {
local_irq_save_hw(flags); flags = hard_local_irq_save();
plldiv = (bfin_read_PLL_DIV() & SSEL) | plldiv = (bfin_read_PLL_DIV() & SSEL) |
dpm_state_table[index].csel; dpm_state_table[index].csel;
bfin_write_PLL_DIV(plldiv); bfin_write_PLL_DIV(plldiv);
...@@ -155,7 +155,7 @@ static int bfin_target(struct cpufreq_policy *poli, ...@@ -155,7 +155,7 @@ static int bfin_target(struct cpufreq_policy *poli,
loops_per_jiffy = cpufreq_scale(lpj_ref, loops_per_jiffy = cpufreq_scale(lpj_ref,
lpj_ref_freq, freqs.new); lpj_ref_freq, freqs.new);
} }
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
/* TODO: just test case for cycles clock source, remove later */ /* TODO: just test case for cycles clock source, remove later */
cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
......
arch/blackfin/mach-common/ints-priority.c
View file @ e36f561a
...@@ -132,8 +132,8 @@ static void bfin_ack_noop(unsigned int irq) ...@@ -132,8 +132,8 @@ static void bfin_ack_noop(unsigned int irq)
static void bfin_core_mask_irq(unsigned int irq) static void bfin_core_mask_irq(unsigned int irq)
{ {
bfin_irq_flags &= ~(1 << irq); bfin_irq_flags &= ~(1 << irq);
if (!irqs_disabled_hw()) if (!hard_irqs_disabled())
local_irq_enable_hw(); hard_local_irq_enable();
} }
static void bfin_core_unmask_irq(unsigned int irq) static void bfin_core_unmask_irq(unsigned int irq)
...@@ -148,8 +148,8 @@ static void bfin_core_unmask_irq(unsigned int irq) ...@@ -148,8 +148,8 @@ static void bfin_core_unmask_irq(unsigned int irq)
* local_irq_enable just does "STI bfin_irq_flags", so it's exactly * local_irq_enable just does "STI bfin_irq_flags", so it's exactly
* what we need. * what we need.
*/ */
if (!irqs_disabled_hw()) if (!hard_irqs_disabled())
local_irq_enable_hw(); hard_local_irq_enable();
return; return;
} }
...@@ -158,12 +158,12 @@ static void bfin_internal_mask_irq(unsigned int irq) ...@@ -158,12 +158,12 @@ static void bfin_internal_mask_irq(unsigned int irq)
unsigned long flags; unsigned long flags;
#ifdef CONFIG_BF53x #ifdef CONFIG_BF53x
local_irq_save_hw(flags); flags = hard_local_irq_save();
bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() & bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
~(1 << SIC_SYSIRQ(irq))); ~(1 << SIC_SYSIRQ(irq)));
#else #else
unsigned mask_bank, mask_bit; unsigned mask_bank, mask_bit;
local_irq_save_hw(flags); flags = hard_local_irq_save();
mask_bank = SIC_SYSIRQ(irq) / 32; mask_bank = SIC_SYSIRQ(irq) / 32;
mask_bit = SIC_SYSIRQ(irq) % 32; mask_bit = SIC_SYSIRQ(irq) % 32;
bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) & bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) &
...@@ -173,7 +173,7 @@ static void bfin_internal_mask_irq(unsigned int irq) ...@@ -173,7 +173,7 @@ static void bfin_internal_mask_irq(unsigned int irq)
~(1 << mask_bit)); ~(1 << mask_bit));
#endif #endif
#endif #endif
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -186,12 +186,12 @@ static void bfin_internal_unmask_irq(unsigned int irq) ...@@ -186,12 +186,12 @@ static void bfin_internal_unmask_irq(unsigned int irq)
unsigned long flags; unsigned long flags;
#ifdef CONFIG_BF53x #ifdef CONFIG_BF53x
local_irq_save_hw(flags); flags = hard_local_irq_save();
bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() | bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
(1 << SIC_SYSIRQ(irq))); (1 << SIC_SYSIRQ(irq)));
#else #else
unsigned mask_bank, mask_bit; unsigned mask_bank, mask_bit;
local_irq_save_hw(flags); flags = hard_local_irq_save();
mask_bank = SIC_SYSIRQ(irq) / 32; mask_bank = SIC_SYSIRQ(irq) / 32;
mask_bit = SIC_SYSIRQ(irq) % 32; mask_bit = SIC_SYSIRQ(irq) % 32;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -207,7 +207,7 @@ static void bfin_internal_unmask_irq(unsigned int irq) ...@@ -207,7 +207,7 @@ static void bfin_internal_unmask_irq(unsigned int irq)
(1 << mask_bit)); (1 << mask_bit));
#endif #endif
#endif #endif
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -264,7 +264,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state) ...@@ -264,7 +264,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
break; break;
} }
local_irq_save_hw(flags); flags = hard_local_irq_save();
if (state) { if (state) {
bfin_sic_iwr[bank] |= (1 << bit); bfin_sic_iwr[bank] |= (1 << bit);
...@@ -275,7 +275,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state) ...@@ -275,7 +275,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
vr_wakeup &= ~wakeup; vr_wakeup &= ~wakeup;
} }
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
return 0; return 0;
} }
......
arch/blackfin/mach-common/pm.c
View file @ e36f561a
...@@ -25,7 +25,7 @@ void bfin_pm_suspend_standby_enter(void) ...@@ -25,7 +25,7 @@ void bfin_pm_suspend_standby_enter(void)
{ {
unsigned long flags; unsigned long flags;
local_irq_save_hw(flags); flags = hard_local_irq_save();
bfin_pm_standby_setup(); bfin_pm_standby_setup();
#ifdef CONFIG_PM_BFIN_SLEEP_DEEPER #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER
...@@ -56,7 +56,7 @@ void bfin_pm_suspend_standby_enter(void) ...@@ -56,7 +56,7 @@ void bfin_pm_suspend_standby_enter(void)
bfin_write_SIC_IWR(IWR_DISABLE_ALL); bfin_write_SIC_IWR(IWR_DISABLE_ALL);
#endif #endif
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
} }
int bf53x_suspend_l1_mem(unsigned char *memptr) int bf53x_suspend_l1_mem(unsigned char *memptr)
...@@ -149,12 +149,12 @@ int bfin_pm_suspend_mem_enter(void) ...@@ -149,12 +149,12 @@ int bfin_pm_suspend_mem_enter(void)
wakeup |= GPWE; wakeup |= GPWE;
#endif #endif
local_irq_save_hw(flags); flags = hard_local_irq_save();
ret = blackfin_dma_suspend(); ret = blackfin_dma_suspend();
if (ret) { if (ret) {
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
kfree(memptr); kfree(memptr);
return ret; return ret;
} }
...@@ -178,7 +178,7 @@ int bfin_pm_suspend_mem_enter(void) ...@@ -178,7 +178,7 @@ int bfin_pm_suspend_mem_enter(void)
bfin_gpio_pm_hibernate_restore(); bfin_gpio_pm_hibernate_restore();
blackfin_dma_resume(); blackfin_dma_resume();
local_irq_restore_hw(flags); hard_local_irq_restore(flags);
kfree(memptr); kfree(memptr);
return 0; return 0;
......
arch/cris/include/arch-v10/arch/irqflags.h 0 → 100644
View file @ e36f561a
#ifndef __ASM_CRIS_ARCH_IRQFLAGS_H
#define __ASM_CRIS_ARCH_IRQFLAGS_H
#include <linux/types.h>
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
asm volatile("move $ccr,%0" : "=rm" (flags) : : "memory");
return flags;
}
static inline void arch_local_irq_disable(void)
{
asm volatile("di" : : : "memory");
}
static inline void arch_local_irq_enable(void)
{
asm volatile("ei" : : : "memory");
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags = arch_local_save_flags();
arch_local_irq_disable();
return flags;
}
static inline void arch_local_irq_restore(unsigned long flags)
{
asm volatile("move %0,$ccr" : : "rm" (flags) : "memory");
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return !(flags & (1 << 5));
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
#endif /* __ASM_CRIS_ARCH_IRQFLAGS_H */
arch/cris/include/arch-v10/arch/system.h
View file @ e36f561a
...@@ -44,20 +44,4 @@ static inline unsigned long _get_base(char * addr) ...@@ -44,20 +44,4 @@ static inline unsigned long _get_base(char * addr)
struct __xchg_dummy { unsigned long a[100]; }; struct __xchg_dummy { unsigned long a[100]; };
#define __xg(x) ((struct __xchg_dummy *)(x)) #define __xg(x) ((struct __xchg_dummy *)(x))
/* interrupt control.. */
#define local_save_flags(x) __asm__ __volatile__ ("move $ccr,%0" : "=rm" (x) : : "memory");
#define local_irq_restore(x) __asm__ __volatile__ ("move %0,$ccr" : : "rm" (x) : "memory");
#define local_irq_disable() __asm__ __volatile__ ( "di" : : :"memory");
#define local_irq_enable() __asm__ __volatile__ ( "ei" : : :"memory");
#define irqs_disabled() \
({ \
unsigned long flags; \
local_save_flags(flags); \
!(flags & (1<<5)); \
})
/* For spinlocks etc */
#define local_irq_save(x) __asm__ __volatile__ ("move $ccr,%0\n\tdi" : "=rm" (x) : : "memory");
#endif #endif
arch/cris/include/arch-v32/arch/irqflags.h 0 → 100644
View file @ e36f561a
#ifndef __ASM_CRIS_ARCH_IRQFLAGS_H
#define __ASM_CRIS_ARCH_IRQFLAGS_H
#include <linux/types.h>
#include <arch/ptrace.h>
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
asm volatile("move $ccs,%0" : "=rm" (flags) : : "memory");
return flags;
}
static inline void arch_local_irq_disable(void)
{
asm volatile("di" : : : "memory");
}
static inline void arch_local_irq_enable(void)
{
asm volatile("ei" : : : "memory");
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags = arch_local_save_flags();
arch_local_irq_disable();
return flags;
}
static inline void arch_local_irq_restore(unsigned long flags)
{
asm volatile("move %0,$ccs" : : "rm" (flags) : "memory");
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return !(flags & (1 << I_CCS_BITNR));
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
#endif /* __ASM_CRIS_ARCH_IRQFLAGS_H */
arch/cris/include/arch-v32/arch/system.h
View file @ e36f561a
...@@ -44,26 +44,4 @@ static inline unsigned long rdsp(void) ...@@ -44,26 +44,4 @@ static inline unsigned long rdsp(void)
struct __xchg_dummy { unsigned long a[100]; }; struct __xchg_dummy { unsigned long a[100]; };
#define __xg(x) ((struct __xchg_dummy *)(x)) #define __xg(x) ((struct __xchg_dummy *)(x))
/* Used for interrupt control. */
#define local_save_flags(x) \
__asm__ __volatile__ ("move $ccs, %0" : "=rm" (x) : : "memory");
#define local_irq_restore(x) \
__asm__ __volatile__ ("move %0, $ccs" : : "rm" (x) : "memory");
#define local_irq_disable() __asm__ __volatile__ ("di" : : : "memory");
#define local_irq_enable() __asm__ __volatile__ ("ei" : : : "memory");
#define irqs_disabled() \
({ \
unsigned long flags; \
\
local_save_flags(flags);\
!(flags & (1 << I_CCS_BITNR)); \
})
/* Used for spinlocks, etc. */
#define local_irq_save(x) \
__asm__ __volatile__ ("move $ccs, %0\n\tdi" : "=rm" (x) : : "memory");
#endif /* _ASM_CRIS_ARCH_SYSTEM_H */ #endif /* _ASM_CRIS_ARCH_SYSTEM_H */
arch/cris/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
#include <arch/irqflags.h>
arch/cris/include/asm/system.h
View file @ e36f561a
#ifndef __ASM_CRIS_SYSTEM_H #ifndef __ASM_CRIS_SYSTEM_H
#define __ASM_CRIS_SYSTEM_H #define __ASM_CRIS_SYSTEM_H
#include <linux/irqflags.h>
#include <arch/system.h> #include <arch/system.h>
/* the switch_to macro calls resume, an asm function in entry.S which does the actual /* the switch_to macro calls resume, an asm function in entry.S which does the actual
......
arch/frv/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
/* FR-V interrupt handling
*
* Copyright (C) 2010 Red Hat, Inc. All Rights Reserved.
* Written by David Howells (dhowells@redhat.com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public Licence
* as published by the Free Software Foundation; either version
* 2 of the Licence, or (at your option) any later version.
*/
#ifndef _ASM_IRQFLAGS_H
#define _ASM_IRQFLAGS_H
/*
* interrupt flag manipulation
* - use virtual interrupt management since touching the PSR is slow
* - ICC2.Z: T if interrupts virtually disabled
* - ICC2.C: F if interrupts really disabled
* - if Z==1 upon interrupt:
* - C is set to 0
* - interrupts are really disabled
* - entry.S returns immediately
* - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
* - if taken, the trap:
* - sets ICC2.C
* - enables interrupts
*/
static inline void arch_local_irq_disable(void)
{
/* set Z flag, but don't change the C flag */
asm volatile(" andcc gr0,gr0,gr0,icc2 \n"
:
:
: "memory", "icc2"
);
}
static inline void arch_local_irq_enable(void)
{
/* clear Z flag and then test the C flag */
asm volatile(" oricc gr0,#1,gr0,icc2 \n"
" tihi icc2,gr0,#2 \n"
:
:
: "memory", "icc2"
);
}
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
asm volatile("movsg ccr,%0"
: "=r"(flags)
:
: "memory");
/* shift ICC2.Z to bit 0 */
flags >>= 26;
/* make flags 1 if interrupts disabled, 0 otherwise */
return flags & 1UL;
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags = arch_local_save_flags();
arch_local_irq_disable();
return flags;
}
static inline void arch_local_irq_restore(unsigned long flags)
{
/* load the Z flag by turning 1 if disabled into 0 if disabled
* and thus setting the Z flag but not the C flag */
asm volatile(" xoricc %0,#1,gr0,icc2 \n"
/* then trap if Z=0 and C=0 */
" tihi icc2,gr0,#2 \n"
:
: "r"(flags)
: "memory", "icc2"
);
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return flags;
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
/*
* real interrupt flag manipulation
*/
#define __arch_local_irq_disable() \
do { \
unsigned long psr; \
asm volatile(" movsg psr,%0 \n" \
" andi %0,%2,%0 \n" \
" ori %0,%1,%0 \n" \
" movgs %0,psr \n" \
: "=r"(psr) \
: "i" (PSR_PIL_14), "i" (~PSR_PIL) \
: "memory"); \
} while (0)
#define __arch_local_irq_enable() \
do { \
unsigned long psr; \
asm volatile(" movsg psr,%0 \n" \
" andi %0,%1,%0 \n" \
" movgs %0,psr \n" \
: "=r"(psr) \
: "i" (~PSR_PIL) \
: "memory"); \
} while (0)
#define __arch_local_save_flags(flags) \
do { \
typecheck(unsigned long, flags); \
asm("movsg psr,%0" \
: "=r"(flags) \
: \
: "memory"); \
} while (0)
#define __arch_local_irq_save(flags) \
do { \
unsigned long npsr; \
typecheck(unsigned long, flags); \
asm volatile(" movsg psr,%0 \n" \
" andi %0,%3,%1 \n" \
" ori %1,%2,%1 \n" \
" movgs %1,psr \n" \
: "=r"(flags), "=r"(npsr) \
: "i" (PSR_PIL_14), "i" (~PSR_PIL) \
: "memory"); \
} while (0)
#define __arch_local_irq_restore(flags) \
do { \
typecheck(unsigned long, flags); \
asm volatile(" movgs %0,psr \n" \
: \
: "r" (flags) \
: "memory"); \
} while (0)
#define __arch_irqs_disabled() \
((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
#endif /* _ASM_IRQFLAGS_H */
arch/frv/include/asm/system.h
View file @ e36f561a
...@@ -36,142 +36,6 @@ do { \ ...@@ -36,142 +36,6 @@ do { \
mb(); \ mb(); \
} while(0) } while(0)
/*
* interrupt flag manipulation
* - use virtual interrupt management since touching the PSR is slow
* - ICC2.Z: T if interrupts virtually disabled
* - ICC2.C: F if interrupts really disabled
* - if Z==1 upon interrupt:
* - C is set to 0
* - interrupts are really disabled
* - entry.S returns immediately
* - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
* - if taken, the trap:
* - sets ICC2.C
* - enables interrupts
*/
#define local_irq_disable() \
do { \
/* set Z flag, but don't change the C flag */ \
asm volatile(" andcc gr0,gr0,gr0,icc2 \n" \
: \
: \
: "memory", "icc2" \
); \
} while(0)
#define local_irq_enable() \
do { \
/* clear Z flag and then test the C flag */ \
asm volatile(" oricc gr0,#1,gr0,icc2 \n" \
" tihi icc2,gr0,#2 \n" \
: \
: \
: "memory", "icc2" \
); \
} while(0)
#define local_save_flags(flags) \
do { \
typecheck(unsigned long, flags); \
asm volatile("movsg ccr,%0" \
: "=r"(flags) \
: \
: "memory"); \
\
/* shift ICC2.Z to bit 0 */ \
flags >>= 26; \
\
/* make flags 1 if interrupts disabled, 0 otherwise */ \
flags &= 1UL; \
} while(0)
#define irqs_disabled() \
({unsigned long flags; local_save_flags(flags); !!flags; })
#define local_irq_save(flags) \
do { \
typecheck(unsigned long, flags); \
local_save_flags(flags); \
local_irq_disable(); \
} while(0)
#define local_irq_restore(flags) \
do { \
typecheck(unsigned long, flags); \
\
/* load the Z flag by turning 1 if disabled into 0 if disabled \
* and thus setting the Z flag but not the C flag */ \
asm volatile(" xoricc %0,#1,gr0,icc2 \n" \
/* then test Z=0 and C=0 */ \
" tihi icc2,gr0,#2 \n" \
: \
: "r"(flags) \
: "memory", "icc2" \
); \
\
} while(0)
/*
* real interrupt flag manipulation
*/
#define __local_irq_disable() \
do { \
unsigned long psr; \
asm volatile(" movsg psr,%0 \n" \
" andi %0,%2,%0 \n" \
" ori %0,%1,%0 \n" \
" movgs %0,psr \n" \
: "=r"(psr) \
: "i" (PSR_PIL_14), "i" (~PSR_PIL) \
: "memory"); \
} while(0)
#define __local_irq_enable() \
do { \
unsigned long psr; \
asm volatile(" movsg psr,%0 \n" \
" andi %0,%1,%0 \n" \
" movgs %0,psr \n" \
: "=r"(psr) \
: "i" (~PSR_PIL) \
: "memory"); \
} while(0)
#define __local_save_flags(flags) \
do { \
typecheck(unsigned long, flags); \
asm("movsg psr,%0" \
: "=r"(flags) \
: \
: "memory"); \
} while(0)
#define __local_irq_save(flags) \
do { \
unsigned long npsr; \
typecheck(unsigned long, flags); \
asm volatile(" movsg psr,%0 \n" \
" andi %0,%3,%1 \n" \
" ori %1,%2,%1 \n" \
" movgs %1,psr \n" \
: "=r"(flags), "=r"(npsr) \
: "i" (PSR_PIL_14), "i" (~PSR_PIL) \
: "memory"); \
} while(0)
#define __local_irq_restore(flags) \
do { \
typecheck(unsigned long, flags); \
asm volatile(" movgs %0,psr \n" \
: \
: "r" (flags) \
: "memory"); \
} while(0)
#define __irqs_disabled() \
((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
/* /*
* Force strict CPU ordering. * Force strict CPU ordering.
*/ */
......
arch/h8300/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
#ifndef _H8300_IRQFLAGS_H
#define _H8300_IRQFLAGS_H
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
asm volatile ("stc ccr,%w0" : "=r" (flags));
return flags;
}
static inline void arch_local_irq_disable(void)
{
asm volatile ("orc #0x80,ccr" : : : "memory");
}
static inline void arch_local_irq_enable(void)
{
asm volatile ("andc #0x7f,ccr" : : : "memory");
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags = arch_local_save_flags();
arch_local_irq_disable();
return flags;
}
static inline void arch_local_irq_restore(unsigned long flags)
{
asm volatile ("ldc %w0,ccr" : : "r" (flags) : "memory");
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return (flags & 0x80) == 0x80;
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
#endif /* _H8300_IRQFLAGS_H */
arch/h8300/include/asm/system.h
View file @ e36f561a
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _H8300_SYSTEM_H #define _H8300_SYSTEM_H
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/irqflags.h>
struct pt_regs; struct pt_regs;
...@@ -51,31 +52,8 @@ asmlinkage void resume(void); ...@@ -51,31 +52,8 @@ asmlinkage void resume(void);
(last) = _last; \ (last) = _last; \
} }
#define __sti() asm volatile ("andc #0x7f,ccr")
#define __cli() asm volatile ("orc #0x80,ccr")
#define __save_flags(x) \
asm volatile ("stc ccr,%w0":"=r" (x))
#define __restore_flags(x) \
asm volatile ("ldc %w0,ccr": :"r" (x))
#define irqs_disabled() \
({ \
unsigned char flags; \
__save_flags(flags); \
((flags & 0x80) == 0x80); \
})
#define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc") #define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc")
/* For spinlocks etc */
#define local_irq_disable() __cli()
#define local_irq_enable() __sti()
#define local_irq_save(x) ({ __save_flags(x); local_irq_disable(); })
#define local_irq_restore(x) __restore_flags(x)
#define local_save_flags(x) __save_flags(x)
/* /*
* Force strict CPU ordering. * Force strict CPU ordering.
* Not really required on H8... * Not really required on H8...
......
arch/ia64/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
/*
* IRQ flags defines.
*
* Copyright (C) 1998-2003 Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com>
* Copyright (C) 1999 Asit Mallick <asit.k.mallick@intel.com>
* Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
*/
#ifndef _ASM_IA64_IRQFLAGS_H
#define _ASM_IA64_IRQFLAGS_H
#ifdef CONFIG_IA64_DEBUG_IRQ
extern unsigned long last_cli_ip;
static inline void arch_maybe_save_ip(unsigned long flags)
{
if (flags & IA64_PSR_I)
last_cli_ip = ia64_getreg(_IA64_REG_IP);
}
#else
#define arch_maybe_save_ip(flags) do {} while (0)
#endif
/*
* - clearing psr.i is implicitly serialized (visible by next insn)
* - setting psr.i requires data serialization
* - we need a stop-bit before reading PSR because we sometimes
* write a floating-point register right before reading the PSR
* and that writes to PSR.mfl
*/
static inline unsigned long arch_local_save_flags(void)
{
ia64_stop();
#ifdef CONFIG_PARAVIRT
return ia64_get_psr_i();
#else
return ia64_getreg(_IA64_REG_PSR);
#endif
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags = arch_local_save_flags();
ia64_stop();
ia64_rsm(IA64_PSR_I);
arch_maybe_save_ip(flags);
return flags;
}
static inline void arch_local_irq_disable(void)
{
#ifdef CONFIG_IA64_DEBUG_IRQ
arch_local_irq_save();
#else
ia64_stop();
ia64_rsm(IA64_PSR_I);
#endif
}
static inline void arch_local_irq_enable(void)
{
ia64_stop();
ia64_ssm(IA64_PSR_I);
ia64_srlz_d();
}
static inline void arch_local_irq_restore(unsigned long flags)
{
#ifdef CONFIG_IA64_DEBUG_IRQ
unsigned long old_psr = arch_local_save_flags();
#endif
ia64_intrin_local_irq_restore(flags & IA64_PSR_I);
arch_maybe_save_ip(old_psr & ~flags);
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return (flags & IA64_PSR_I) == 0;
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
static inline void arch_safe_halt(void)
{
ia64_pal_halt_light(); /* PAL_HALT_LIGHT */
}
#endif /* _ASM_IA64_IRQFLAGS_H */
arch/ia64/include/asm/system.h
View file @ e36f561a
...@@ -107,87 +107,11 @@ extern struct ia64_boot_param { ...@@ -107,87 +107,11 @@ extern struct ia64_boot_param {
*/ */
#define set_mb(var, value) do { (var) = (value); mb(); } while (0) #define set_mb(var, value) do { (var) = (value); mb(); } while (0)
#define safe_halt() ia64_pal_halt_light() /* PAL_HALT_LIGHT */
/* /*
* The group barrier in front of the rsm & ssm are necessary to ensure * The group barrier in front of the rsm & ssm are necessary to ensure
* that none of the previous instructions in the same group are * that none of the previous instructions in the same group are
* affected by the rsm/ssm. * affected by the rsm/ssm.
*/ */
/* For spinlocks etc */
/*
* - clearing psr.i is implicitly serialized (visible by next insn)
* - setting psr.i requires data serialization
* - we need a stop-bit before reading PSR because we sometimes
* write a floating-point register right before reading the PSR
* and that writes to PSR.mfl
*/
#ifdef CONFIG_PARAVIRT
#define __local_save_flags() ia64_get_psr_i()
#else
#define __local_save_flags() ia64_getreg(_IA64_REG_PSR)
#endif
#define __local_irq_save(x) \
do { \
ia64_stop(); \
(x) = __local_save_flags(); \
ia64_stop(); \
ia64_rsm(IA64_PSR_I); \
} while (0)
#define __local_irq_disable() \
do { \
ia64_stop(); \
ia64_rsm(IA64_PSR_I); \
} while (0)
#define __local_irq_restore(x) ia64_intrin_local_irq_restore((x) & IA64_PSR_I)
#ifdef CONFIG_IA64_DEBUG_IRQ
extern unsigned long last_cli_ip;
# define __save_ip() last_cli_ip = ia64_getreg(_IA64_REG_IP)
# define local_irq_save(x) \
do { \
unsigned long __psr; \
\
__local_irq_save(__psr); \
if (__psr & IA64_PSR_I) \
__save_ip(); \
(x) = __psr; \
} while (0)
# define local_irq_disable() do { unsigned long __x; local_irq_save(__x); } while (0)
# define local_irq_restore(x) \
do { \
unsigned long __old_psr, __psr = (x); \
\
local_save_flags(__old_psr); \
__local_irq_restore(__psr); \
if ((__old_psr & IA64_PSR_I) && !(__psr & IA64_PSR_I)) \
__save_ip(); \
} while (0)
#else /* !CONFIG_IA64_DEBUG_IRQ */
# define local_irq_save(x) __local_irq_save(x)
# define local_irq_disable() __local_irq_disable()
# define local_irq_restore(x) __local_irq_restore(x)
#endif /* !CONFIG_IA64_DEBUG_IRQ */
#define local_irq_enable() ({ ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); })
#define local_save_flags(flags) ({ ia64_stop(); (flags) = __local_save_flags(); })
#define irqs_disabled() \
({ \
unsigned long __ia64_id_flags; \
local_save_flags(__ia64_id_flags); \
(__ia64_id_flags & IA64_PSR_I) == 0; \
})
#ifdef __KERNEL__ #ifdef __KERNEL__
......
arch/m32r/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2001 Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
* Copyright (C) 2004, 2006 Hirokazu Takata <takata at linux-m32r.org>
*/
#ifndef _ASM_M32R_IRQFLAGS_H
#define _ASM_M32R_IRQFLAGS_H
#include <linux/types.h>
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
asm volatile("mvfc %0,psw" : "=r"(flags));
return flags;
}
static inline void arch_local_irq_disable(void)
{
#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
asm volatile (
"clrpsw #0x40 -> nop"
: : : "memory");
#else
unsigned long tmpreg0, tmpreg1;
asm volatile (
"ld24 %0, #0 ; Use 32-bit insn. \n\t"
"mvfc %1, psw ; No interrupt can be accepted here. \n\t"
"mvtc %0, psw \n\t"
"and3 %0, %1, #0xffbf \n\t"
"mvtc %0, psw \n\t"
: "=&r" (tmpreg0), "=&r" (tmpreg1)
:
: "cbit", "memory");
#endif
}
static inline void arch_local_irq_enable(void)
{
#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
asm volatile (
"setpsw #0x40 -> nop"
: : : "memory");
#else
unsigned long tmpreg;
asm volatile (
"mvfc %0, psw; \n\t"
"or3 %0, %0, #0x0040; \n\t"
"mvtc %0, psw; \n\t"
: "=&r" (tmpreg)
:
: "cbit", "memory");
#endif
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags;
#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
asm volatile (
"mvfc %0, psw; \n\t"
"clrpsw #0x40 -> nop; \n\t"
: "=r" (flags)
:
: "memory");
#else
unsigned long tmpreg;
asm volatile (
"ld24 %1, #0 \n\t"
"mvfc %0, psw \n\t"
"mvtc %1, psw \n\t"
"and3 %1, %0, #0xffbf \n\t"
"mvtc %1, psw \n\t"
: "=r" (flags), "=&r" (tmpreg)
:
: "cbit", "memory");
#endif
return flags;
}
static inline void arch_local_irq_restore(unsigned long flags)
{
asm volatile("mvtc %0,psw"
:
: "r" (flags)
: "cbit", "memory");
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return !(flags & 0x40);
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
#endif /* _ASM_M32R_IRQFLAGS_H */
arch/m32r/include/asm/system.h
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/irqflags.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -54,71 +55,6 @@ ...@@ -54,71 +55,6 @@
); \ ); \
} while(0) } while(0)
/* Interrupt Control */
#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
#define local_irq_enable() \
__asm__ __volatile__ ("setpsw #0x40 -> nop": : :"memory")
#define local_irq_disable() \
__asm__ __volatile__ ("clrpsw #0x40 -> nop": : :"memory")
#else /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
static inline void local_irq_enable(void)
{
unsigned long tmpreg;
__asm__ __volatile__(
"mvfc %0, psw; \n\t"
"or3 %0, %0, #0x0040; \n\t"
"mvtc %0, psw; \n\t"
: "=&r" (tmpreg) : : "cbit", "memory");
}
static inline void local_irq_disable(void)
{
unsigned long tmpreg0, tmpreg1;
__asm__ __volatile__(
"ld24 %0, #0 ; Use 32-bit insn. \n\t"
"mvfc %1, psw ; No interrupt can be accepted here. \n\t"
"mvtc %0, psw \n\t"
"and3 %0, %1, #0xffbf \n\t"
"mvtc %0, psw \n\t"
: "=&r" (tmpreg0), "=&r" (tmpreg1) : : "cbit", "memory");
}
#endif /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
#define local_save_flags(x) \
__asm__ __volatile__("mvfc %0,psw" : "=r"(x) : /* no input */)
#define local_irq_restore(x) \
__asm__ __volatile__("mvtc %0,psw" : /* no outputs */ \
: "r" (x) : "cbit", "memory")
#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
#define local_irq_save(x) \
__asm__ __volatile__( \
"mvfc %0, psw; \n\t" \
"clrpsw #0x40 -> nop; \n\t" \
: "=r" (x) : /* no input */ : "memory")
#else /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
#define local_irq_save(x) \
({ \
unsigned long tmpreg; \
__asm__ __volatile__( \
"ld24 %1, #0 \n\t" \
"mvfc %0, psw \n\t" \
"mvtc %1, psw \n\t" \
"and3 %1, %0, #0xffbf \n\t" \
"mvtc %1, psw \n\t" \
: "=r" (x), "=&r" (tmpreg) \
: : "cbit", "memory"); \
})
#endif /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
#define irqs_disabled() \
({ \
unsigned long flags; \
local_save_flags(flags); \
!(flags & 0x40); \
})
#define nop() __asm__ __volatile__ ("nop" : : ) #define nop() __asm__ __volatile__ ("nop" : : )
#define xchg(ptr, x) \ #define xchg(ptr, x) \
......
arch/m68k/include/asm/entry_no.h
View file @ e36f561a
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* M68K COLDFIRE * M68K COLDFIRE
*/ */
#define ALLOWINT 0xf8ff #define ALLOWINT (~0x700)
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
......
arch/m68k/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
#ifndef _M68K_IRQFLAGS_H
#define _M68K_IRQFLAGS_H
#include <linux/types.h>
#include <linux/hardirq.h>
#include <linux/preempt.h>
#include <asm/thread_info.h>
#include <asm/entry.h>
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
asm volatile ("movew %%sr,%0" : "=d" (flags) : : "memory");
return flags;
}
static inline void arch_local_irq_disable(void)
{
#ifdef CONFIG_COLDFIRE
asm volatile (
"move %/sr,%%d0 \n\t"
"ori.l #0x0700,%%d0 \n\t"
"move %%d0,%/sr \n"
: /* no outputs */
:
: "cc", "%d0", "memory");
#else
asm volatile ("oriw #0x0700,%%sr" : : : "memory");
#endif
}
static inline void arch_local_irq_enable(void)
{
#if defined(CONFIG_COLDFIRE)
asm volatile (
"move %/sr,%%d0 \n\t"
"andi.l #0xf8ff,%%d0 \n\t"
"move %%d0,%/sr \n"
: /* no outputs */
:
: "cc", "%d0", "memory");
#else
# if defined(CONFIG_MMU)
if (MACH_IS_Q40 || !hardirq_count())
# endif
asm volatile (
"andiw %0,%%sr"
:
: "i" (ALLOWINT)
: "memory");
#endif
}
static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags = arch_local_save_flags();
arch_local_irq_disable();
return flags;
}
static inline void arch_local_irq_restore(unsigned long flags)
{
asm volatile ("movew %0,%%sr" : : "d" (flags) : "memory");
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return (flags & ~ALLOWINT) != 0;
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
#endif /* _M68K_IRQFLAGS_H */
arch/m68k/include/asm/system_mm.h
View file @ e36f561a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irqflags.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/entry.h> #include <asm/entry.h>
...@@ -62,30 +63,6 @@ asmlinkage void resume(void); ...@@ -62,30 +63,6 @@ asmlinkage void resume(void);
#define smp_wmb() barrier() #define smp_wmb() barrier()
#define smp_read_barrier_depends() ((void)0) #define smp_read_barrier_depends() ((void)0)
/* interrupt control.. */
#if 0
#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
#else
#include <linux/hardirq.h>
#define local_irq_enable() ({ \
if (MACH_IS_Q40 || !hardirq_count()) \
asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory"); \
})
#endif
#define local_irq_disable() asm volatile ("oriw #0x0700,%%sr": : : "memory")
#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
static inline int irqs_disabled(void)
{
unsigned long flags;
local_save_flags(flags);
return flags & ~ALLOWINT;
}
/* For spinlocks etc */
#define local_irq_save(x) ({ local_save_flags(x); local_irq_disable(); })
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
struct __xchg_dummy { unsigned long a[100]; }; struct __xchg_dummy { unsigned long a[100]; };
......
arch/m68k/include/asm/system_no.h
View file @ e36f561a
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _M68KNOMMU_SYSTEM_H #define _M68KNOMMU_SYSTEM_H
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/irqflags.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/entry.h> #include <asm/entry.h>
...@@ -46,54 +47,6 @@ asmlinkage void resume(void); ...@@ -46,54 +47,6 @@ asmlinkage void resume(void);
(last) = _last; \ (last) = _last; \
} }
#ifdef CONFIG_COLDFIRE
#define local_irq_enable() __asm__ __volatile__ ( \
"move %/sr,%%d0\n\t" \
"andi.l #0xf8ff,%%d0\n\t" \
"move %%d0,%/sr\n" \
: /* no outputs */ \
: \
: "cc", "%d0", "memory")
#define local_irq_disable() __asm__ __volatile__ ( \
"move %/sr,%%d0\n\t" \
"ori.l #0x0700,%%d0\n\t" \
"move %%d0,%/sr\n" \
: /* no outputs */ \
: \
: "cc", "%d0", "memory")
/* For spinlocks etc */
#define local_irq_save(x) __asm__ __volatile__ ( \
"movew %%sr,%0\n\t" \
"movew #0x0700,%%d0\n\t" \
"or.l %0,%%d0\n\t" \
"movew %%d0,%/sr" \
: "=d" (x) \
: \
: "cc", "%d0", "memory")
#else
/* portable version */ /* FIXME - see entry.h*/
#define ALLOWINT 0xf8ff
#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
#define local_irq_disable() asm volatile ("oriw #0x0700,%%sr": : : "memory")
#endif
#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
/* For spinlocks etc */
#ifndef local_irq_save
#define local_irq_save(x) do { local_save_flags(x); local_irq_disable(); } while (0)
#endif
#define irqs_disabled() \
({ \
unsigned long flags; \
local_save_flags(flags); \
((flags & 0x0700) == 0x0700); \
})
#define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc") #define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc")
/* /*
...@@ -206,12 +159,4 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz ...@@ -206,12 +159,4 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
#define arch_align_stack(x) (x) #define arch_align_stack(x) (x)
static inline int irqs_disabled_flags(unsigned long flags)
{
if (flags & 0x0700)
return 0;
else
return 1;
}
#endif /* _M68KNOMMU_SYSTEM_H */ #endif /* _M68KNOMMU_SYSTEM_H */
arch/m68knommu/kernel/asm-offsets.c
View file @ e36f561a
...@@ -74,8 +74,6 @@ int main(void) ...@@ -74,8 +74,6 @@ int main(void)
DEFINE(PT_PTRACED, PT_PTRACED); DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(THREAD_SIZE, THREAD_SIZE);
/* Offsets in thread_info structure */ /* Offsets in thread_info structure */
DEFINE(TI_TASK, offsetof(struct thread_info, task)); DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain)); DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
......
arch/m68knommu/platform/coldfire/head.S
View file @ e36f561a
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <asm/coldfire.h> #include <asm/coldfire.h>
#include <asm/mcfcache.h> #include <asm/mcfcache.h>
#include <asm/mcfsim.h> #include <asm/mcfsim.h>
#include <asm/thread_info.h>
/*****************************************************************************/ /*****************************************************************************/
......
arch/microblaze/include/asm/irqflags.h
View file @ e36f561a
...@@ -9,103 +9,114 @@ ...@@ -9,103 +9,114 @@
#ifndef _ASM_MICROBLAZE_IRQFLAGS_H #ifndef _ASM_MICROBLAZE_IRQFLAGS_H
#define _ASM_MICROBLAZE_IRQFLAGS_H #define _ASM_MICROBLAZE_IRQFLAGS_H
#include <linux/irqflags.h> #include <linux/types.h>
#include <asm/registers.h> #include <asm/registers.h>
# if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR #ifdef CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
# define raw_local_irq_save(flags) \ static inline unsigned long arch_local_irq_save(void)
do { \ {
asm volatile (" msrclr %0, %1; \ unsigned long flags;
nop;" \ asm volatile(" msrclr %0, %1 \n"
: "=r"(flags) \ " nop \n"
: "i"(MSR_IE) \ : "=r"(flags)
: "memory"); \ : "i"(MSR_IE)
} while (0) : "memory");
return flags;
# define raw_local_irq_disable() \ }
do { \
asm volatile (" msrclr r0, %0; \ static inline void arch_local_irq_disable(void)
nop;" \ {
: \ /* this uses r0 without declaring it - is that correct? */
: "i"(MSR_IE) \ asm volatile(" msrclr r0, %0 \n"
: "memory"); \ " nop \n"
} while (0) :
: "i"(MSR_IE)
# define raw_local_irq_enable() \ : "memory");
do { \ }
asm volatile (" msrset r0, %0; \
nop;" \ static inline void arch_local_irq_enable(void)
: \ {
: "i"(MSR_IE) \ /* this uses r0 without declaring it - is that correct? */
: "memory"); \ asm volatile(" msrset r0, %0 \n"
} while (0) " nop \n"
:
# else /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR == 0 */ : "i"(MSR_IE)
: "memory");
# define raw_local_irq_save(flags) \ }
do { \
register unsigned tmp; \ #else /* !CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
asm volatile (" mfs %0, rmsr; \
nop; \ static inline unsigned long arch_local_irq_save(void)
andi %1, %0, %2; \ {
mts rmsr, %1; \ unsigned long flags, tmp;
nop;" \ asm volatile (" mfs %0, rmsr \n"
: "=r"(flags), "=r" (tmp) \ " nop \n"
: "i"(~MSR_IE) \ " andi %1, %0, %2 \n"
: "memory"); \ " mts rmsr, %1 \n"
} while (0) " nop \n"
: "=r"(flags), "=r"(tmp)
# define raw_local_irq_disable() \ : "i"(~MSR_IE)
do { \ : "memory");
register unsigned tmp; \ return flags;
asm volatile (" mfs %0, rmsr; \ }
nop; \
andi %0, %0, %1; \ static inline void arch_local_irq_disable(void)
mts rmsr, %0; \ {
nop;" \ unsigned long tmp;
: "=r"(tmp) \ asm volatile(" mfs %0, rmsr \n"
: "i"(~MSR_IE) \ " nop \n"
: "memory"); \ " andi %0, %0, %1 \n"
} while (0) " mts rmsr, %0 \n"
" nop \n"
# define raw_local_irq_enable() \ : "=r"(tmp)
do { \ : "i"(~MSR_IE)
register unsigned tmp; \ : "memory");
asm volatile (" mfs %0, rmsr; \ }
nop; \
ori %0, %0, %1; \ static inline void arch_local_irq_enable(void)
mts rmsr, %0; \ {
nop;" \ unsigned long tmp;
: "=r"(tmp) \ asm volatile(" mfs %0, rmsr \n"
: "i"(MSR_IE) \ " nop \n"
: "memory"); \ " ori %0, %0, %1 \n"
} while (0) " mts rmsr, %0 \n"
" nop \n"
# endif /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */ : "=r"(tmp)
: "i"(MSR_IE)
#define raw_local_irq_restore(flags) \ : "memory");
do { \ }
asm volatile (" mts rmsr, %0; \
nop;" \ #endif /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
: \
: "r"(flags) \ static inline unsigned long arch_local_save_flags(void)
: "memory"); \
} while (0)
static inline unsigned long get_msr(void)
{ {
unsigned long flags; unsigned long flags;
asm volatile (" mfs %0, rmsr; \ asm volatile(" mfs %0, rmsr \n"
nop;" \ " nop \n"
: "=r"(flags) \ : "=r"(flags)
: \ :
: "memory"); \ : "memory");
return flags; return flags;
} }
#define raw_local_save_flags(flags) ((flags) = get_msr()) static inline void arch_local_irq_restore(unsigned long flags)
#define raw_irqs_disabled() ((get_msr() & MSR_IE) == 0) {
#define raw_irqs_disabled_flags(flags) ((flags & MSR_IE) == 0) asm volatile(" mts rmsr, %0 \n"
" nop \n"
:
: "r"(flags)
: "memory");
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)
{
return (flags & MSR_IE) == 0;
}
static inline bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
#endif /* _ASM_MICROBLAZE_IRQFLAGS_H */ #endif /* _ASM_MICROBLAZE_IRQFLAGS_H */
arch/mips/alchemy/devboards/bcsr.c
View file @ e36f561a
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/irq.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-db1x00/bcsr.h> #include <asm/mach-db1x00/bcsr.h>
......
arch/mips/ar7/irq.c
View file @ e36f561a
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
......
arch/mips/bcm63xx/irq.c
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <bcm63xx_cpu.h> #include <bcm63xx_cpu.h>
......
arch/mips/cavium-octeon/serial.c
View file @ e36f561a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/irq.h>
#include <asm/time.h> #include <asm/time.h>
......
arch/mips/dec/setup.c
View file @ e36f561a
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/irq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/cpu.h> #include <asm/cpu.h>
......
arch/mips/include/asm/irqflags.h
View file @ e36f561a
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/hazards.h> #include <asm/hazards.h>
__asm__( __asm__(
" .macro raw_local_irq_enable \n" " .macro arch_local_irq_enable \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
" .set noat \n" " .set noat \n"
...@@ -40,7 +40,7 @@ __asm__( ...@@ -40,7 +40,7 @@ __asm__(
extern void smtc_ipi_replay(void); extern void smtc_ipi_replay(void);
static inline void raw_local_irq_enable(void) static inline void arch_local_irq_enable(void)
{ {
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
/* /*
...@@ -50,7 +50,7 @@ static inline void raw_local_irq_enable(void) ...@@ -50,7 +50,7 @@ static inline void raw_local_irq_enable(void)
smtc_ipi_replay(); smtc_ipi_replay();
#endif #endif
__asm__ __volatile__( __asm__ __volatile__(
"raw_local_irq_enable" "arch_local_irq_enable"
: /* no outputs */ : /* no outputs */
: /* no inputs */ : /* no inputs */
: "memory"); : "memory");
...@@ -76,7 +76,7 @@ static inline void raw_local_irq_enable(void) ...@@ -76,7 +76,7 @@ static inline void raw_local_irq_enable(void)
* Workaround: mask EXL bit of the result or place a nop before mfc0. * Workaround: mask EXL bit of the result or place a nop before mfc0.
*/ */
__asm__( __asm__(
" .macro raw_local_irq_disable\n" " .macro arch_local_irq_disable\n"
" .set push \n" " .set push \n"
" .set noat \n" " .set noat \n"
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
...@@ -97,17 +97,17 @@ __asm__( ...@@ -97,17 +97,17 @@ __asm__(
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
static inline void raw_local_irq_disable(void) static inline void arch_local_irq_disable(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"raw_local_irq_disable" "arch_local_irq_disable"
: /* no outputs */ : /* no outputs */
: /* no inputs */ : /* no inputs */
: "memory"); : "memory");
} }
__asm__( __asm__(
" .macro raw_local_save_flags flags \n" " .macro arch_local_save_flags flags \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
...@@ -118,13 +118,15 @@ __asm__( ...@@ -118,13 +118,15 @@ __asm__(
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
#define raw_local_save_flags(x) \ static inline unsigned long arch_local_save_flags(void)
__asm__ __volatile__( \ {
"raw_local_save_flags %0" \ unsigned long flags;
: "=r" (x)) asm volatile("arch_local_save_flags %0" : "=r" (flags));
return flags;
}
__asm__( __asm__(
" .macro raw_local_irq_save result \n" " .macro arch_local_irq_save result \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
" .set noat \n" " .set noat \n"
...@@ -148,15 +150,18 @@ __asm__( ...@@ -148,15 +150,18 @@ __asm__(
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
#define raw_local_irq_save(x) \ static inline unsigned long arch_local_irq_save(void)
__asm__ __volatile__( \ {
"raw_local_irq_save\t%0" \ unsigned long flags;
: "=r" (x) \ asm volatile("arch_local_irq_save\t%0"
: /* no inputs */ \ : "=r" (flags)
: "memory") : /* no inputs */
: "memory");
return flags;
}
__asm__( __asm__(
" .macro raw_local_irq_restore flags \n" " .macro arch_local_irq_restore flags \n"
" .set push \n" " .set push \n"
" .set noreorder \n" " .set noreorder \n"
" .set noat \n" " .set noat \n"
...@@ -196,7 +201,7 @@ __asm__( ...@@ -196,7 +201,7 @@ __asm__(
" .endm \n"); " .endm \n");
static inline void raw_local_irq_restore(unsigned long flags) static inline void arch_local_irq_restore(unsigned long flags)
{ {
unsigned long __tmp1; unsigned long __tmp1;
...@@ -211,24 +216,24 @@ static inline void raw_local_irq_restore(unsigned long flags) ...@@ -211,24 +216,24 @@ static inline void raw_local_irq_restore(unsigned long flags)
#endif #endif
__asm__ __volatile__( __asm__ __volatile__(
"raw_local_irq_restore\t%0" "arch_local_irq_restore\t%0"
: "=r" (__tmp1) : "=r" (__tmp1)
: "0" (flags) : "0" (flags)
: "memory"); : "memory");
} }
static inline void __raw_local_irq_restore(unsigned long flags) static inline void __arch_local_irq_restore(unsigned long flags)
{ {
unsigned long __tmp1; unsigned long __tmp1;
__asm__ __volatile__( __asm__ __volatile__(
"raw_local_irq_restore\t%0" "arch_local_irq_restore\t%0"
: "=r" (__tmp1) : "=r" (__tmp1)
: "0" (flags) : "0" (flags)
: "memory"); : "memory");
} }
static inline int raw_irqs_disabled_flags(unsigned long flags) static inline int arch_irqs_disabled_flags(unsigned long flags)
{ {
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
/* /*
......
arch/mips/include/asm/mach-loongson/loongson.h
View file @ e36f561a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h>
/* loongson internal northbridge initialization */ /* loongson internal northbridge initialization */
extern void bonito_irq_init(void); extern void bonito_irq_init(void);
......
arch/mips/jazz/irq.c
View file @ e36f561a
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/i8253.h> #include <asm/i8253.h>
......
arch/mips/kernel/cevt-bcm1480.c
View file @ e36f561a
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/io.h> #include <asm/io.h>
......
arch/mips/kernel/cevt-ds1287.c
View file @ e36f561a
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <linux/irq.h>
#include <asm/time.h> #include <asm/time.h>
......
arch/mips/kernel/cevt-gt641xx.c
View file @ e36f561a
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/irq.h>
#include <asm/gt64120.h> #include <asm/gt64120.h>
#include <asm/time.h> #include <asm/time.h>
......
arch/mips/kernel/cevt-r4k.c
View file @ e36f561a
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h>
#include <asm/smtc_ipi.h> #include <asm/smtc_ipi.h>
#include <asm/time.h> #include <asm/time.h>
......
arch/mips/kernel/cevt-sb1250.c
View file @ e36f561a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
......
arch/mips/kernel/cevt-smtc.c
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h>
#include <asm/smtc_ipi.h> #include <asm/smtc_ipi.h>
#include <asm/time.h> #include <asm/time.h>
......
arch/mips/kernel/cevt-txx9.c
View file @ e36f561a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/txx9tmr.h> #include <asm/txx9tmr.h>
......
arch/mips/kernel/i8253.c
View file @ e36f561a
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/irq.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/i8253.h> #include <asm/i8253.h>
......
arch/mips/kernel/i8259.c
View file @ e36f561a
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/irq.h>
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/io.h> #include <asm/io.h>
......
arch/mips/kernel/irq-gic.c
View file @ e36f561a
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/gic.h> #include <asm/gic.h>
#include <asm/gcmpregs.h> #include <asm/gcmpregs.h>
#include <asm/irq.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/find.h>
......
arch/mips/kernel/irq-rm7000.c
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
......
arch/mips/kernel/irq-rm9000.c
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
......
arch/mips/kernel/irq_cpu.c
View file @ e36f561a
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
......
arch/mips/kernel/irq_txx9.c
View file @ e36f561a
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/irq.h>
#include <asm/txx9irq.h> #include <asm/txx9irq.h>
struct txx9_irc_reg { struct txx9_irc_reg {
......
arch/mips/kernel/smtc.c
View file @ e36f561a
...@@ -1038,7 +1038,7 @@ void deferred_smtc_ipi(void) ...@@ -1038,7 +1038,7 @@ void deferred_smtc_ipi(void)
* but it's more efficient, given that we're already * but it's more efficient, given that we're already
* running down the IPI queue. * running down the IPI queue.
*/ */
__raw_local_irq_restore(flags); __arch_local_irq_restore(flags);
} }
} }
...@@ -1190,7 +1190,7 @@ void smtc_ipi_replay(void) ...@@ -1190,7 +1190,7 @@ void smtc_ipi_replay(void)
/* /*
** But use a raw restore here to avoid recursion. ** But use a raw restore here to avoid recursion.
*/ */
__raw_local_irq_restore(flags); __arch_local_irq_restore(flags);
if (pipi) { if (pipi) {
self_ipi(pipi); self_ipi(pipi);
......
arch/mips/kernel/traps.c
View file @ e36f561a
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/kprobes.h> #include <linux/kprobes.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/kdb.h> #include <linux/kdb.h>
#include <linux/irq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/branch.h> #include <asm/branch.h>
...@@ -51,7 +52,6 @@ ...@@ -51,7 +52,6 @@
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
#include <asm/irq.h>
#include <asm/uasm.h> #include <asm/uasm.h>
extern void check_wait(void); extern void check_wait(void);
......
arch/mips/mti-malta/malta-platform.c
View file @ e36f561a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
......
arch/mips/pci/ops-tx3927.c
View file @ e36f561a
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/txx9irq.h> #include <asm/txx9irq.h>
......
arch/mips/pci/ops-tx4927.c
View file @ e36f561a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/txx9/pci.h> #include <asm/txx9/pci.h>
#include <asm/txx9/tx4927pcic.h> #include <asm/txx9/tx4927pcic.h>
......
arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
View file @ e36f561a
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/irq.h>
#include <asm/system.h> #include <asm/system.h>
......
arch/mips/powertv/asic/irq_asic.c
View file @ e36f561a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
......
arch/mips/rb532/serial.c
View file @ e36f561a
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/irq.h>
#include <asm/serial.h> #include <asm/serial.h>
#include <asm/mach-rc32434/rb.h> #include <asm/mach-rc32434/rb.h>
......
arch/mips/sni/a20r.c
View file @ e36f561a
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
......
arch/mips/sni/pcimt.c
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
......
arch/mips/sni/pcit.c
View file @ e36f561a
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
......
arch/mips/sni/rm200.c
View file @ e36f561a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/io.h> #include <linux/io.h>
......
arch/mips/sni/time.c
View file @ e36f561a
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
......
arch/mips/txx9/generic/irq_tx4927.c
View file @ e36f561a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/txx9/tx4927.h> #include <asm/txx9/tx4927.h>
......
arch/mips/txx9/generic/irq_tx4938.c
View file @ e36f561a
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/txx9/tx4938.h> #include <asm/txx9/tx4938.h>
......
arch/mips/txx9/generic/irq_tx4939.c
View file @ e36f561a
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/txx9irq.h> #include <asm/txx9irq.h>
......
arch/mips/txx9/generic/setup.c
View file @ e36f561a
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/irq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/reboot.h> #include <asm/reboot.h>
......
arch/mips/txx9/jmr3927/irq.c
View file @ e36f561a
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
......
arch/mips/txx9/rbtx4927/irq.c
View file @ e36f561a
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/txx9/generic.h> #include <asm/txx9/generic.h>
......
arch/mips/txx9/rbtx4938/irq.c
View file @ e36f561a
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/txx9/generic.h> #include <asm/txx9/generic.h>
#include <asm/txx9/rbtx4938.h> #include <asm/txx9/rbtx4938.h>
......
arch/mips/txx9/rbtx4939/irq.c
View file @ e36f561a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/txx9/rbtx4939.h> #include <asm/txx9/rbtx4939.h>
......
arch/mips/vr41xx/common/irq.c
View file @ e36f561a
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/system.h> #include <asm/system.h>
......
arch/mips/vr41xx/common/siu.c
View file @ e36f561a
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/irq.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/vr41xx/siu.h> #include <asm/vr41xx/siu.h>
......
arch/mn10300/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
This diff is collapsed.
arch/mn10300/include/asm/system.h
View file @ e36f561a
This diff is collapsed.
arch/mn10300/kernel/entry.S
View file @ e36f561a
This diff is collapsed.
arch/parisc/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
This diff is collapsed.
arch/parisc/include/asm/system.h
View file @ e36f561a
This diff is collapsed.
arch/powerpc/include/asm/hw_irq.h
View file @ e36f561a
This diff is collapsed.
arch/powerpc/include/asm/irqflags.h
View file @ e36f561a
This diff is collapsed.
arch/powerpc/kernel/exceptions-64s.S
View file @ e36f561a
This diff is collapsed.
arch/powerpc/kernel/irq.c
View file @ e36f561a
This diff is collapsed.
arch/s390/include/asm/irqflags.h
View file @ e36f561a
This diff is collapsed.
arch/s390/include/asm/system.h
View file @ e36f561a
This diff is collapsed.
arch/s390/kernel/mem_detect.c
View file @ e36f561a
This diff is collapsed.
arch/s390/mm/init.c
View file @ e36f561a
This diff is collapsed.
arch/s390/mm/maccess.c
View file @ e36f561a
This diff is collapsed.
arch/score/include/asm/irqflags.h
View file @ e36f561a
This diff is collapsed.
arch/sh/include/asm/irqflags.h
View file @ e36f561a
This diff is collapsed.
arch/sh/include/asm/syscalls_32.h
View file @ e36f561a
This diff is collapsed.
arch/sh/kernel/irq_32.c
View file @ e36f561a
This diff is collapsed.
arch/sparc/include/asm/irqflags_32.h
View file @ e36f561a
This diff is collapsed.
arch/sparc/include/asm/irqflags_64.h
View file @ e36f561a
This diff is collapsed.
arch/sparc/kernel/irq_32.c
View file @ e36f561a
This diff is collapsed.
arch/sparc/prom/p1275.c
View file @ e36f561a
This diff is collapsed.
arch/tile/include/asm/irqflags.h
View file @ e36f561a
This diff is collapsed.
arch/x86/include/asm/irqflags.h
View file @ e36f561a
This diff is collapsed.
arch/x86/include/asm/paravirt.h
View file @ e36f561a
This diff is collapsed.
arch/x86/xen/spinlock.c
View file @ e36f561a
This diff is collapsed.
arch/xtensa/include/asm/irqflags.h 0 → 100644
View file @ e36f561a
This diff is collapsed.
arch/xtensa/include/asm/system.h
View file @ e36f561a
This diff is collapsed.
crypto/des_generic.c
View file @ e36f561a
This diff is collapsed.
drivers/net/bfin_mac.c
View file @ e36f561a
This diff is collapsed.
drivers/net/smc91x.c
View file @ e36f561a
This diff is collapsed.
drivers/s390/char/sclp.c
View file @ e36f561a
This diff is collapsed.
drivers/vlynq/vlynq.c
View file @ e36f561a
This diff is collapsed.
drivers/watchdog/octeon-wdt-main.c
View file @ e36f561a
This diff is collapsed.
include/asm-generic/atomic.h
View file @ e36f561a
This diff is collapsed.
include/asm-generic/cmpxchg-local.h
View file @ e36f561a
This diff is collapsed.
include/asm-generic/irqflags.h
View file @ e36f561a
This diff is collapsed.
include/linux/hardirq.h
View file @ e36f561a
This diff is collapsed.
include/linux/irqflags.h
View file @ e36f561a
This diff is collapsed.
include/linux/list.h
View file @ e36f561a
This diff is collapsed.
include/linux/spinlock.h
View file @ e36f561a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7