Commit fd43fe19 authored by Chris Zankel's avatar Chris Zankel Committed by Linus Torvalds

[PATCH] xtensa: fix irq and misc fixes

Update the architecture specific interrupt handling code for Xtensa to support
the new API.  Use generic BUG macros in bug.h, and some minor fixes.
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5fcf7bb7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Xtensa built-in interrupt controller and some generic functions copied * Xtensa built-in interrupt controller and some generic functions copied
* from i386. * from i386.
* *
* Copyright (C) 2002 - 2005 Tensilica, Inc. * Copyright (C) 2002 - 2006 Tensilica, Inc.
* Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar * Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
* *
* *
...@@ -22,11 +22,6 @@ ...@@ -22,11 +22,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/platform.h> #include <asm/platform.h>
static void enable_xtensa_irq(unsigned int irq);
static void disable_xtensa_irq(unsigned int irq);
static void mask_and_ack_xtensa(unsigned int irq);
static void end_xtensa_irq(unsigned int irq);
static unsigned int cached_irq_mask; static unsigned int cached_irq_mask;
atomic_t irq_err_count; atomic_t irq_err_count;
...@@ -46,8 +41,16 @@ void ack_bad_irq(unsigned int irq) ...@@ -46,8 +41,16 @@ void ack_bad_irq(unsigned int irq)
* handlers). * handlers).
*/ */
unsigned int do_IRQ(int irq, struct pt_regs *regs) asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
{ {
struct pt_regs *old_regs = set_irq_regs(regs);
struct irq_desc *desc = irq_desc + irq;
if (irq >= NR_IRQS) {
printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
__FUNCTION__, irq);
}
irq_enter(); irq_enter();
#ifdef CONFIG_DEBUG_STACKOVERFLOW #ifdef CONFIG_DEBUG_STACKOVERFLOW
...@@ -63,12 +66,10 @@ unsigned int do_IRQ(int irq, struct pt_regs *regs) ...@@ -63,12 +66,10 @@ unsigned int do_IRQ(int irq, struct pt_regs *regs)
sp - sizeof(struct thread_info)); sp - sizeof(struct thread_info));
} }
#endif #endif
desc->handle_irq(irq, desc);
__do_IRQ(irq, regs);
irq_exit(); irq_exit();
set_irq_regs(old_regs);
return 1;
} }
/* /*
...@@ -118,72 +119,68 @@ skip: ...@@ -118,72 +119,68 @@ skip:
} }
return 0; return 0;
} }
/* shutdown is same as "disable" */
#define shutdown_xtensa_irq disable_xtensa_irq
static unsigned int startup_xtensa_irq(unsigned int irq) static void xtensa_irq_mask(unsigned int irq)
{
enable_xtensa_irq(irq);
return 0; /* never anything pending */
}
static struct hw_interrupt_type xtensa_irq_type = {
"Xtensa-IRQ",
startup_xtensa_irq,
shutdown_xtensa_irq,
enable_xtensa_irq,
disable_xtensa_irq,
mask_and_ack_xtensa,
end_xtensa_irq
};
static inline void mask_irq(unsigned int irq)
{ {
cached_irq_mask &= ~(1 << irq); cached_irq_mask &= ~(1 << irq);
set_sr (cached_irq_mask, INTENABLE); set_sr (cached_irq_mask, INTENABLE);
} }
static inline void unmask_irq(unsigned int irq) static void xtensa_irq_unmask(unsigned int irq)
{ {
cached_irq_mask |= 1 << irq; cached_irq_mask |= 1 << irq;
set_sr (cached_irq_mask, INTENABLE); set_sr (cached_irq_mask, INTENABLE);
} }
static void disable_xtensa_irq(unsigned int irq) static void xtensa_irq_ack(unsigned int irq)
{ {
unsigned long flags; set_sr(1 << irq, INTCLEAR);
local_save_flags(flags);
mask_irq(irq);
local_irq_restore(flags);
} }
static void enable_xtensa_irq(unsigned int irq) static int xtensa_irq_retrigger(unsigned int irq)
{ {
unsigned long flags; set_sr (1 << irq, INTSET);
local_save_flags(flags); return 1;
unmask_irq(irq);
local_irq_restore(flags);
}
static void mask_and_ack_xtensa(unsigned int irq)
{
disable_xtensa_irq(irq);
} }
static void end_xtensa_irq(unsigned int irq)
{
enable_xtensa_irq(irq);
}
static struct irq_chip xtensa_irq_chip = {
.name = "xtensa",
.mask = xtensa_irq_mask,
.unmask = xtensa_irq_unmask,
.ack = xtensa_irq_ack,
.retrigger = xtensa_irq_retrigger,
};
void __init init_IRQ(void) void __init init_IRQ(void)
{ {
int i; int index;
for (i=0; i < XTENSA_NR_IRQS; i++) for (index = 0; index < XTENSA_NR_IRQS; index++) {
irq_desc[i].chip = &xtensa_irq_type; int mask = 1 << index;
cached_irq_mask = 0; if (mask & XCHAL_INTTYPE_MASK_SOFTWARE)
set_irq_chip_and_handler(index, &xtensa_irq_chip,
handle_simple_irq);
platform_init_irq(); else if (mask & XCHAL_INTTYPE_MASK_EXTERN_EDGE)
set_irq_chip_and_handler(index, &xtensa_irq_chip,
handle_edge_irq);
else if (mask & XCHAL_INTTYPE_MASK_EXTERN_LEVEL)
set_irq_chip_and_handler(index, &xtensa_irq_chip,
handle_level_irq);
else if (mask & XCHAL_INTTYPE_MASK_TIMER)
set_irq_chip_and_handler(index, &xtensa_irq_chip,
handle_edge_irq);
else /* XCHAL_INTTYPE_MASK_WRITE_ERROR */
/* XCHAL_INTTYPE_MASK_NMI */
set_irq_chip_and_handler(index, &xtensa_irq_chip,
handle_level_irq);
}
cached_irq_mask = 0;
} }
...@@ -47,7 +47,7 @@ unsigned long long sched_clock(void) ...@@ -47,7 +47,7 @@ unsigned long long sched_clock(void)
return (unsigned long long)jiffies * (1000000000 / HZ); return (unsigned long long)jiffies * (1000000000 / HZ);
} }
static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t timer_interrupt(int irq, void *dev_id);
static struct irqaction timer_irqaction = { static struct irqaction timer_irqaction = {
.handler = timer_interrupt, .handler = timer_interrupt,
.flags = IRQF_DISABLED, .flags = IRQF_DISABLED,
...@@ -150,7 +150,7 @@ EXPORT_SYMBOL(do_gettimeofday); ...@@ -150,7 +150,7 @@ EXPORT_SYMBOL(do_gettimeofday);
* The timer interrupt is called HZ times per second. * The timer interrupt is called HZ times per second.
*/ */
irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) irqreturn_t timer_interrupt (int irq, void *dev_id)
{ {
unsigned long next; unsigned long next;
...@@ -160,9 +160,9 @@ irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) ...@@ -160,9 +160,9 @@ irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
again: again:
while ((signed long)(get_ccount() - next) > 0) { while ((signed long)(get_ccount() - next) > 0) {
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING);
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
update_process_times(user_mode(regs)); update_process_times(user_mode(get_irq_regs()));
#endif #endif
write_seqlock(&xtime_lock); write_seqlock(&xtime_lock);
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#define _NOCLANGUAGE #define _NOCLANGUAGE
#undef __ASSEMBLER__
#include <xtensa/config/core.h> #include <xtensa/config/core.h>
#include <xtensa/config/system.h> #include <xtensa/config/system.h>
OUTPUT_ARCH(xtensa) OUTPUT_ARCH(xtensa)
......
...@@ -13,29 +13,6 @@ ...@@ -13,29 +13,6 @@
#ifndef _XTENSA_BUG_H #ifndef _XTENSA_BUG_H
#define _XTENSA_BUG_H #define _XTENSA_BUG_H
#include <linux/stringify.h> #include <asm-generic/bug.h>
#define ILL __asm__ __volatile__ (".byte 0,0,0\n")
#ifdef CONFIG_KALLSYMS
# define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
ILL; \
} while (0)
#else
# define BUG() do { \
printk("kernel BUG!\n"); \
ILL; \
} while (0)
#endif
#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
#define PAGE_BUG(page) do { BUG(); } while (0)
#define WARN_ON(condition) do { \
if (unlikely((condition)!=0)) { \
printk ("Warning in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
dump_stack(); \
} \
} while (0)
#endif /* _XTENSA_BUG_H */ #endif /* _XTENSA_BUG_H */
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/types.h> #include <asm/types.h>
static __inline__ __const__ __u32 ___arch__swab32(__u32 x) static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
{ {
__u32 res; __u32 res;
/* instruction sequence from Xtensa ISA release 2/2000 */ /* instruction sequence from Xtensa ISA release 2/2000 */
...@@ -29,7 +29,7 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x) ...@@ -29,7 +29,7 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
return res; return res;
} }
static __inline__ __const__ __u16 ___arch__swab16(__u16 x) static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
{ {
/* Given that 'short' values are signed (i.e., can be negative), /* Given that 'short' values are signed (i.e., can be negative),
* we cannot assume that the upper 16-bits of the register are * we cannot assume that the upper 16-bits of the register are
......
#include <asm-generic/irq_regs.h>
...@@ -218,6 +218,8 @@ ...@@ -218,6 +218,8 @@
#define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/ #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/
#ifdef __KERNEL__
/* /*
* "Conditional" syscalls * "Conditional" syscalls
* *
...@@ -230,6 +232,7 @@ ...@@ -230,6 +232,7 @@
#define __ARCH_WANT_SYS_UTIME #define __ARCH_WANT_SYS_UTIME
#define __ARCH_WANT_SYS_LLSEEK #define __ARCH_WANT_SYS_LLSEEK
#define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGACTION
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _XTENSA_UNISTD_H */ #endif /* _XTENSA_UNISTD_H */
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
/* ... */ /* ... */
#ifdef _ASMLANGUAGE #ifdef __ASSEMBLER__
/* /*
* Assembly-language specific definitions (assembly macros, etc.). * Assembly-language specific definitions (assembly macros, etc.).
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment