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
98 lines
1.8 KiB
C
98 lines
1.8 KiB
C
/*
|
|
* include/asm/irqflags.h
|
|
*
|
|
* IRQ flags handling
|
|
*
|
|
* This file gets included from lowlevel asm headers too, to provide
|
|
* wrapped versions of the local_irq_*() APIs, based on the
|
|
* arch_local_irq_*() functions from the lowlevel headers.
|
|
*/
|
|
#ifndef _ASM_IRQFLAGS_H
|
|
#define _ASM_IRQFLAGS_H
|
|
|
|
#include <asm/pil.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
static inline unsigned long arch_local_save_flags(void)
|
|
{
|
|
unsigned long flags;
|
|
|
|
__asm__ __volatile__(
|
|
"rdpr %%pil, %0"
|
|
: "=r" (flags)
|
|
);
|
|
|
|
return flags;
|
|
}
|
|
|
|
static inline void arch_local_irq_restore(unsigned long flags)
|
|
{
|
|
__asm__ __volatile__(
|
|
"wrpr %0, %%pil"
|
|
: /* no output */
|
|
: "r" (flags)
|
|
: "memory"
|
|
);
|
|
}
|
|
|
|
static inline void arch_local_irq_disable(void)
|
|
{
|
|
__asm__ __volatile__(
|
|
"wrpr %0, %%pil"
|
|
: /* no outputs */
|
|
: "i" (PIL_NORMAL_MAX)
|
|
: "memory"
|
|
);
|
|
}
|
|
|
|
static inline void arch_local_irq_enable(void)
|
|
{
|
|
__asm__ __volatile__(
|
|
"wrpr 0, %%pil"
|
|
: /* no outputs */
|
|
: /* no inputs */
|
|
: "memory"
|
|
);
|
|
}
|
|
|
|
static inline int arch_irqs_disabled_flags(unsigned long flags)
|
|
{
|
|
return (flags > 0);
|
|
}
|
|
|
|
static inline int arch_irqs_disabled(void)
|
|
{
|
|
return arch_irqs_disabled_flags(arch_local_save_flags());
|
|
}
|
|
|
|
static inline unsigned long arch_local_irq_save(void)
|
|
{
|
|
unsigned long flags, tmp;
|
|
|
|
/* Disable interrupts to PIL_NORMAL_MAX unless we already
|
|
* are using PIL_NMI, in which case PIL_NMI is retained.
|
|
*
|
|
* The only values we ever program into the %pil are 0,
|
|
* PIL_NORMAL_MAX and PIL_NMI.
|
|
*
|
|
* Since PIL_NMI is the largest %pil value and all bits are
|
|
* set in it (0xf), it doesn't matter what PIL_NORMAL_MAX
|
|
* actually is.
|
|
*/
|
|
__asm__ __volatile__(
|
|
"rdpr %%pil, %0\n\t"
|
|
"or %0, %2, %1\n\t"
|
|
"wrpr %1, 0x0, %%pil"
|
|
: "=r" (flags), "=r" (tmp)
|
|
: "i" (PIL_NORMAL_MAX)
|
|
: "memory"
|
|
);
|
|
|
|
return flags;
|
|
}
|
|
|
|
#endif /* (__ASSEMBLY__) */
|
|
|
|
#endif /* !(_ASM_IRQFLAGS_H) */
|