mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Fix IRQ flag handling naming
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 <[email protected]> [X86, FRV, MN10300] Signed-off-by: Chris Metcalf <[email protected]> [Tile] Signed-off-by: Michal Simek <[email protected]> [Microblaze] Tested-by: Catalin Marinas <[email protected]> [ARM] Acked-by: Thomas Gleixner <[email protected]> Acked-by: Haavard Skinnemoen <[email protected]> [AVR] Acked-by: Tony Luck <[email protected]> [IA-64] Acked-by: Hirokazu Takata <[email protected]> [M32R] Acked-by: Greg Ungerer <[email protected]> [M68K/M68KNOMMU] Acked-by: Ralf Baechle <[email protected]> [MIPS] Acked-by: Kyle McMartin <[email protected]> [PA-RISC] Acked-by: Paul Mackerras <[email protected]> [PowerPC] Acked-by: Martin Schwidefsky <[email protected]> [S390] Acked-by: Chen Liqin <[email protected]> [Score] Acked-by: Matt Fleming <[email protected]> [SH] Acked-by: David S. Miller <[email protected]> [Sparc] Acked-by: Chris Zankel <[email protected]> [Xtensa] Reviewed-by: Richard Henderson <[email protected]> [Alpha] Reviewed-by: Yoshinori Sato <[email protected]> [H8300] Cc: [email protected] [CRIS] Cc: [email protected] [CRIS] Cc: [email protected]
This commit is contained in:
David Howells
parent
ca4d3e6746
commit
df9ee29270
63 changed files with 1482 additions and 1158 deletions
|
|
@ -9,103 +9,114 @@
|
|||
#ifndef _ASM_MICROBLAZE_IRQFLAGS_H
|
||||
#define _ASM_MICROBLAZE_IRQFLAGS_H
|
||||
|
||||
#include <linux/irqflags.h>
|
||||
#include <linux/types.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) \
|
||||
do { \
|
||||
asm volatile (" msrclr %0, %1; \
|
||||
nop;" \
|
||||
: "=r"(flags) \
|
||||
: "i"(MSR_IE) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
# define raw_local_irq_disable() \
|
||||
do { \
|
||||
asm volatile (" msrclr r0, %0; \
|
||||
nop;" \
|
||||
: \
|
||||
: "i"(MSR_IE) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
# define raw_local_irq_enable() \
|
||||
do { \
|
||||
asm volatile (" msrset r0, %0; \
|
||||
nop;" \
|
||||
: \
|
||||
: "i"(MSR_IE) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
# else /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR == 0 */
|
||||
|
||||
# define raw_local_irq_save(flags) \
|
||||
do { \
|
||||
register unsigned tmp; \
|
||||
asm volatile (" mfs %0, rmsr; \
|
||||
nop; \
|
||||
andi %1, %0, %2; \
|
||||
mts rmsr, %1; \
|
||||
nop;" \
|
||||
: "=r"(flags), "=r" (tmp) \
|
||||
: "i"(~MSR_IE) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
# define raw_local_irq_disable() \
|
||||
do { \
|
||||
register unsigned tmp; \
|
||||
asm volatile (" mfs %0, rmsr; \
|
||||
nop; \
|
||||
andi %0, %0, %1; \
|
||||
mts rmsr, %0; \
|
||||
nop;" \
|
||||
: "=r"(tmp) \
|
||||
: "i"(~MSR_IE) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
# define raw_local_irq_enable() \
|
||||
do { \
|
||||
register unsigned tmp; \
|
||||
asm volatile (" mfs %0, rmsr; \
|
||||
nop; \
|
||||
ori %0, %0, %1; \
|
||||
mts rmsr, %0; \
|
||||
nop;" \
|
||||
: "=r"(tmp) \
|
||||
: "i"(MSR_IE) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
# endif /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
|
||||
|
||||
#define raw_local_irq_restore(flags) \
|
||||
do { \
|
||||
asm volatile (" mts rmsr, %0; \
|
||||
nop;" \
|
||||
: \
|
||||
: "r"(flags) \
|
||||
: "memory"); \
|
||||
} while (0)
|
||||
|
||||
static inline unsigned long get_msr(void)
|
||||
static inline unsigned long arch_local_irq_save(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
asm volatile (" mfs %0, rmsr; \
|
||||
nop;" \
|
||||
: "=r"(flags) \
|
||||
: \
|
||||
: "memory"); \
|
||||
asm volatile(" msrclr %0, %1 \n"
|
||||
" nop \n"
|
||||
: "=r"(flags)
|
||||
: "i"(MSR_IE)
|
||||
: "memory");
|
||||
return flags;
|
||||
}
|
||||
|
||||
#define raw_local_save_flags(flags) ((flags) = get_msr())
|
||||
#define raw_irqs_disabled() ((get_msr() & MSR_IE) == 0)
|
||||
#define raw_irqs_disabled_flags(flags) ((flags & MSR_IE) == 0)
|
||||
static inline void arch_local_irq_disable(void)
|
||||
{
|
||||
/* this uses r0 without declaring it - is that correct? */
|
||||
asm volatile(" msrclr r0, %0 \n"
|
||||
" nop \n"
|
||||
:
|
||||
: "i"(MSR_IE)
|
||||
: "memory");
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_enable(void)
|
||||
{
|
||||
/* this uses r0 without declaring it - is that correct? */
|
||||
asm volatile(" msrset r0, %0 \n"
|
||||
" nop \n"
|
||||
:
|
||||
: "i"(MSR_IE)
|
||||
: "memory");
|
||||
}
|
||||
|
||||
#else /* !CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
|
||||
|
||||
static inline unsigned long arch_local_irq_save(void)
|
||||
{
|
||||
unsigned long flags, tmp;
|
||||
asm volatile (" mfs %0, rmsr \n"
|
||||
" nop \n"
|
||||
" andi %1, %0, %2 \n"
|
||||
" mts rmsr, %1 \n"
|
||||
" nop \n"
|
||||
: "=r"(flags), "=r"(tmp)
|
||||
: "i"(~MSR_IE)
|
||||
: "memory");
|
||||
return flags;
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_disable(void)
|
||||
{
|
||||
unsigned long tmp;
|
||||
asm volatile(" mfs %0, rmsr \n"
|
||||
" nop \n"
|
||||
" andi %0, %0, %1 \n"
|
||||
" mts rmsr, %0 \n"
|
||||
" nop \n"
|
||||
: "=r"(tmp)
|
||||
: "i"(~MSR_IE)
|
||||
: "memory");
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_enable(void)
|
||||
{
|
||||
unsigned long tmp;
|
||||
asm volatile(" mfs %0, rmsr \n"
|
||||
" nop \n"
|
||||
" ori %0, %0, %1 \n"
|
||||
" mts rmsr, %0 \n"
|
||||
" nop \n"
|
||||
: "=r"(tmp)
|
||||
: "i"(MSR_IE)
|
||||
: "memory");
|
||||
}
|
||||
|
||||
#endif /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
|
||||
|
||||
static inline unsigned long arch_local_save_flags(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
asm volatile(" mfs %0, rmsr \n"
|
||||
" nop \n"
|
||||
: "=r"(flags)
|
||||
:
|
||||
: "memory");
|
||||
return flags;
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_restore(unsigned long flags)
|
||||
{
|
||||
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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue