mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 22:53:20 +00:00
df9ee29270
Fix the IRQ flag handling naming. In linux/irqflags.h under one configuration, it maps: local_irq_enable() -> raw_local_irq_enable() local_irq_disable() -> raw_local_irq_disable() local_irq_save() -> raw_local_irq_save() ... and under the other configuration, it maps: raw_local_irq_enable() -> local_irq_enable() raw_local_irq_disable() -> local_irq_disable() raw_local_irq_save() -> local_irq_save() ... This is quite confusing. There should be one set of names expected of the arch, and this should be wrapped to give another set of names that are expected by users of this facility. Change this to have the arch provide: flags = arch_local_save_flags() flags = arch_local_irq_save() arch_local_irq_restore(flags) arch_local_irq_disable() arch_local_irq_enable() arch_irqs_disabled_flags(flags) arch_irqs_disabled() arch_safe_halt() Then linux/irqflags.h wraps these to provide: raw_local_save_flags(flags) raw_local_irq_save(flags) raw_local_irq_restore(flags) raw_local_irq_disable() raw_local_irq_enable() raw_irqs_disabled_flags(flags) raw_irqs_disabled() raw_safe_halt() with type checking on the flags 'arguments', and then wraps those to provide: local_save_flags(flags) local_irq_save(flags) local_irq_restore(flags) local_irq_disable() local_irq_enable() irqs_disabled_flags(flags) irqs_disabled() safe_halt() with tracing included if enabled. The arch functions can now all be inline functions rather than some of them having to be macros. Signed-off-by: David Howells <dhowells@redhat.com> [X86, FRV, MN10300] Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> [Tile] Signed-off-by: Michal Simek <monstr@monstr.eu> [Microblaze] Tested-by: Catalin Marinas <catalin.marinas@arm.com> [ARM] Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> [AVR] Acked-by: Tony Luck <tony.luck@intel.com> [IA-64] Acked-by: Hirokazu Takata <takata@linux-m32r.org> [M32R] Acked-by: Greg Ungerer <gerg@uclinux.org> [M68K/M68KNOMMU] Acked-by: Ralf Baechle <ralf@linux-mips.org> [MIPS] Acked-by: Kyle McMartin <kyle@mcmartin.ca> [PA-RISC] Acked-by: Paul Mackerras <paulus@samba.org> [PowerPC] Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> [S390] Acked-by: Chen Liqin <liqin.chen@sunplusct.com> [Score] Acked-by: Matt Fleming <matt@console-pimps.org> [SH] Acked-by: David S. Miller <davem@davemloft.net> [Sparc] Acked-by: Chris Zankel <chris@zankel.net> [Xtensa] Reviewed-by: Richard Henderson <rth@twiddle.net> [Alpha] Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp> [H8300] Cc: starvik@axis.com [CRIS] Cc: jesper.nilsson@axis.com [CRIS] Cc: linux-cris-kernel@axis.com
222 lines
5.0 KiB
C
222 lines
5.0 KiB
C
/*
|
|
* interface to Blackfin CEC
|
|
*
|
|
* Copyright 2009 Analog Devices Inc.
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#ifndef __ASM_BFIN_IRQFLAGS_H__
|
|
#define __ASM_BFIN_IRQFLAGS_H__
|
|
|
|
#include <mach/blackfin.h>
|
|
|
|
#ifdef CONFIG_SMP
|
|
# include <asm/pda.h>
|
|
# include <asm/processor.h>
|
|
/* Forward decl needed due to cdef inter dependencies */
|
|
static inline uint32_t __pure bfin_dspid(void);
|
|
# define blackfin_core_id() (bfin_dspid() & 0xff)
|
|
# define bfin_irq_flags cpu_pda[blackfin_core_id()].imask
|
|
#else
|
|
extern unsigned long bfin_irq_flags;
|
|
#endif
|
|
|
|
static inline void bfin_sti(unsigned long flags)
|
|
{
|
|
asm volatile("sti %0;" : : "d" (flags));
|
|
}
|
|
|
|
static inline unsigned long bfin_cli(void)
|
|
{
|
|
unsigned long flags;
|
|
asm volatile("cli %0;" : "=d" (flags));
|
|
return flags;
|
|
}
|
|
|
|
#ifdef CONFIG_DEBUG_HWERR
|
|
# define bfin_no_irqs 0x3f
|
|
#else
|
|
# define bfin_no_irqs 0x1f
|
|
#endif
|
|
|
|
/*****************************************************************************/
|
|
/*
|
|
* Hard, untraced CPU interrupt flag manipulation and access.
|
|
*/
|
|
static inline void __hard_local_irq_disable(void)
|
|
{
|
|
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();
|
|
}
|
|
|
|
static inline unsigned long __hard_local_irq_save(void)
|
|
{
|
|
unsigned long flags;
|
|
flags = bfin_cli();
|
|
#ifdef CONFIG_DEBUG_HWERR
|
|
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();
|
|
}
|
|
|
|
static inline void arch_local_irq_enable(void)
|
|
{
|
|
barrier();
|
|
ipipe_check_context(ipipe_root_domain);
|
|
__ipipe_unstall_root();
|
|
}
|
|
|
|
static inline unsigned long arch_local_save_flags(void)
|
|
{
|
|
return __ipipe_test_root() ? bfin_no_irqs : bfin_irq_flags;
|
|
}
|
|
|
|
static inline int arch_irqs_disabled_flags(unsigned long flags)
|
|
{
|
|
return flags == bfin_no_irqs;
|
|
}
|
|
|
|
static inline void arch_local_irq_save_ptr(unsigned long *_flags)
|
|
{
|
|
x = __ipipe_test_and_stall_root() ? bfin_no_irqs : bfin_irq_flags;
|
|
barrier();
|
|
}
|
|
|
|
static inline unsigned long arch_local_irq_save(void)
|
|
{
|
|
ipipe_check_context(ipipe_root_domain);
|
|
return __hard_local_irq_save();
|
|
}
|
|
|
|
static inline unsigned long arch_mangle_irq_bits(int virt, unsigned long real)
|
|
{
|
|
/*
|
|
* Merge virtual and real interrupt mask bits into a single
|
|
* 32bit word.
|
|
*/
|
|
return (real & ~(1 << 31)) | ((virt != 0) << 31);
|
|
}
|
|
|
|
static inline int arch_demangle_irq_bits(unsigned long *x)
|
|
{
|
|
int virt = (*x & (1 << 31)) != 0;
|
|
*x &= ~(1L << 31);
|
|
return virt;
|
|
}
|
|
|
|
/*
|
|
* Interface to various arch routines that may be traced.
|
|
*/
|
|
#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
|
|
static inline void hard_local_irq_disable(void)
|
|
{
|
|
if (!hard_irqs_disabled()) {
|
|
__hard_local_irq_disable();
|
|
ipipe_trace_begin(0x80000000);
|
|
}
|
|
}
|
|
|
|
static inline void hard_local_irq_enable(void)
|
|
{
|
|
if (hard_irqs_disabled()) {
|
|
ipipe_trace_end(0x80000000);
|
|
__hard_local_irq_enable();
|
|
}
|
|
}
|
|
|
|
static inline unsigned long hard_local_irq_save(void)
|
|
{
|
|
unsigned long flags = hard_local_save_flags();
|
|
if (!hard_irqs_disabled_flags(flags)) {
|
|
__hard_local_irq_disable();
|
|
ipipe_trace_begin(0x80000001);
|
|
}
|
|
return flags;
|
|
}
|
|
|
|
static inline void hard_local_irq_restore(unsigned long flags)
|
|
{
|
|
if (!hard_irqs_disabled_flags(flags)) {
|
|
ipipe_trace_end(0x80000001);
|
|
__hard_local_irq_enable();
|
|
}
|
|
}
|
|
|
|
#else /* !CONFIG_IPIPE_TRACE_IRQSOFF */
|
|
# define hard_local_irq_disable() __hard_local_irq_disable()
|
|
# define hard_local_irq_enable() __hard_local_irq_enable()
|
|
# define hard_local_irq_save() __hard_local_irq_save()
|
|
# define hard_local_irq_restore(flags) __hard_local_irq_restore(flags)
|
|
#endif /* !CONFIG_IPIPE_TRACE_IRQSOFF */
|
|
|
|
#else /* CONFIG_IPIPE */
|
|
|
|
/*
|
|
* Direct interface to linux/irqflags.h.
|
|
*/
|
|
#define arch_local_save_flags() hard_local_save_flags()
|
|
#define arch_local_irq_save(flags) __hard_local_irq_save()
|
|
#define arch_local_irq_restore(flags) __hard_local_irq_restore(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 arch_irqs_disabled() hard_irqs_disabled()
|
|
|
|
/*
|
|
* Interface to various arch routines that may be traced.
|
|
*/
|
|
#define hard_local_irq_save() __hard_local_irq_save()
|
|
#define hard_local_irq_restore(flags) __hard_local_irq_restore(flags)
|
|
#define hard_local_irq_enable() __hard_local_irq_enable()
|
|
#define hard_local_irq_disable() __hard_local_irq_disable()
|
|
|
|
|
|
#endif /* !CONFIG_IPIPE */
|
|
#endif
|