3c776a0791
When running a multi-platform kernel on Atari, warning messages like
the following may be printed:
WARNING: at /root/linux-3.10.1/init/main.c:698 do_one_initcall+0x12e/0x13a()
initcall param_sysfs_init+0x0/0x1a4 returned with disabled interrupts
This is caused by the different definitions of ALLOWINT for Atari and
other platforms:
#if defined(MACH_ATARI_ONLY)
#define ALLOWINT (~0x500)
#else
#define ALLOWINT (~0x700)
#endif
On Atari, we want to disable the high-frequency HSYNC interrupt:
- On Atari-only kernels, this is handled completely through ALLOWINT,
- On multi-platform kernels, this is handled by disabling the HSYNC
interrupt from the interrupt handler.
However, as in the latter case arch_irqs_disabled_flags() didn't ignore the
disabling of the HSYNC interrupt, irqs_disabled() would detect false
positives.
Ignore the HSYNC interrupt when running on Atari to fix this.
For single-platform kernels this test is optimized away by the compiler.
Reported-by: Thorsten Glaser <tg@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Thorsten Glaser <tg@debian.org>
83 lines
1.6 KiB
C
83 lines
1.6 KiB
C
#ifndef _M68K_IRQFLAGS_H
|
|
#define _M68K_IRQFLAGS_H
|
|
|
|
#include <linux/types.h>
|
|
#ifdef CONFIG_MMU
|
|
#include <linux/hardirq.h>
|
|
#endif
|
|
#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)
|
|
{
|
|
if (MACH_IS_ATARI) {
|
|
/* Ignore HSYNC = ipl 2 on Atari */
|
|
return (flags & ~(ALLOWINT | 0x200)) != 0;
|
|
}
|
|
return (flags & ~ALLOWINT) != 0;
|
|
}
|
|
|
|
static inline bool arch_irqs_disabled(void)
|
|
{
|
|
return arch_irqs_disabled_flags(arch_local_save_flags());
|
|
}
|
|
|
|
#endif /* _M68K_IRQFLAGS_H */
|