mirror of
https://github.com/torvalds/linux.git
synced 2024-11-20 11:01:38 +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
95 lines
2.0 KiB
C
95 lines
2.0 KiB
C
/*
|
|
* 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 */
|