m68knommu: generic irq handling
PATCH RESEND 1/1 m68knommu: generic irq handling
Change the m68knommu irq handling to use the generic irq framework.
Signed-off-by Greg Ungerer <[email protected]>
---
arch/m68knommu/Kconfig | 4 arch/m68knommu/kernel/Makefile | 4 arch/m68knommu/kernel/asm-offsets.c | 5 arch/m68knommu/kernel/irq.c | 82 +++++++++ arch/m68knommu/kernel/traps.c | 2 arch/m68knommu/platform/5307/Makefile | 2 arch/m68knommu/platform/5307/entry.S | 47 +---- arch/m68knommu/platform/5307/ints.c | 279 --------------------------------- arch/m68knommu/platform/5307/vectors.c | 29 ++- arch/m68knommu/platform/68328/entry.S | 10 - arch/m68knommu/platform/68328/ints.c | 130 ++------------- arch/m68knommu/platform/68360/entry.S | 6 arch/m68knommu/platform/68360/ints.c | 233 +-------------------------- include/asm-m68knommu/irq.h | 75 -------- include/asm-m68knommu/irqnode.h | 36 ---- include/asm-m68knommu/m68360.h | 8 include/asm-m68knommu/traps.h | 4 17 files changed, 176 insertions(+), 780 deletions(-)
arch/m68knommu/Kconfig +4 -0
@@ -45,6 +45,10 @@ bool default y +config GENERIC_HARDIRQS + bool + default y + config GENERIC_CALIBRATE_DELAY bool default y
arch/m68knommu/kernel/asm-offsets.c +0 -5
@@ -15,7 +15,6 @@#include <linux/hardirq.h> #include <asm/bootinfo.h> #include <asm/irq.h> -#include <asm/irqnode.h> #include <asm/thread_info.h> #define DEFINE (sym, val) \
@@ -72,10 +71,6 @@#else /* bitfields are a bit difficult */ DEFINE (PT_VECTOR , offsetof(struct pt_regs , pc) +4 ); -/* offsets into the irq_handler struct */ -DEFINE (IRQ_HANDLER , offsetof(struct irq_node , handler)); -DEFINE (IRQ_DEVID , offsetof(struct irq_node , dev_id)); -DEFINE (IRQ_NEXT , offsetof(struct irq_node , next));#endif /* offsets into the kernel_stat struct */
arch/m68knommu/kernel/irq.c +82 -0
82 lines not on this page · raw message
arch/m68knommu/kernel/Makefile +2 -2
@@ -4,8 +4,8 @@ extra-y := vmlinux.lds -obj-y += dma.o entry.o init_task.o m68k_ksyms.o process.o ptrace.o semaphore.o \ - setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o +obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \ + semaphore.o setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_COMEMPCI) += comempci.o
arch/m68knommu/kernel/traps.c +0 -2
@@ -62,8 +62,6 @@void __init trap_init (void ) { -if (mach_trap_init) -mach_trap_init (); }void die_if_kernel (char *str,struct pt_regs *fp,int nr)
arch/m68knommu/platform/5307/entry.S +10 -32
75 lines not on this page · raw message
arch/m68knommu/platform/5307/ints.c +0 -279
279 lines not on this page · raw message
arch/m68knommu/platform/5307/Makefile +1 -1
@@ -16,7 +16,7 @@ AFLAGS += -DDEBUGGER_COMPATIBLE_CACHE=1 endif -obj-$(CONFIG_COLDFIRE) += entry.o vectors.o ints.o +obj-$(CONFIG_COLDFIRE) += entry.o vectors.o obj-$(CONFIG_M5206) += timers.o obj-$(CONFIG_M5206e) += timers.o obj-$(CONFIG_M520x) += pit.o
arch/m68knommu/platform/5307/vectors.c +20 -9
@@ -3,23 +3,17 @@/* * linux/arch/m68knommu/platform/5307/vectors.c * -* Copyright (C) 1999-2003, Greg Ungerer <[email protected]> +* Copyright (C) 1999-2007, Greg Ungerer <[email protected]> */ /***************************************************************************/ #include <linux/kernel.h> -#include <linux/sched.h> -#include <linux/param.h> #include <linux/init.h> -#include <linux/unistd.h> -#include <linux/delay.h> -#include <asm/irq.h> -#include <asm/dma.h> +#include <linux/irq.h> #include <asm/traps.h> #include <asm/machdep.h> #include <asm/coldfire.h> -#include <asm/mcftimer.h> #include <asm/mcfsim.h> #include <asm/mcfdma.h> #include <asm/mcfwdebug.h>
@@ -56,7 +50,7 @@ asmlinkage void system_call(void); asmlinkage void inthandler(void); -void __init coldfire_trap_init (void ) +void __init init_vectors (void ) {int i;
@@ -86,6 +80,23 @@/***************************************************************************/ +void enable_vector (unsigned int irq) +{ +/* Currently no action on ColdFire */ +} + +void disable_vector (unsigned int irq) +{ +/* Currently no action on ColdFire */ +} + +void ack_vector (unsigned int irq) +{ +/* Currently no action on ColdFire */ +} + +/***************************************************************************/ +void coldfire_reset (void ) {HARD_RESET_NOW ();
arch/m68knommu/platform/68328/entry.S +0 -10
@@ -133,7 +133,6 @@ */ inthandler1: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -145,7 +144,6 @@ inthandler2: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -157,7 +155,6 @@ inthandler3: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -169,7 +166,6 @@ inthandler4: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -181,7 +177,6 @@ inthandler5: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -193,7 +188,6 @@ inthandler6: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -205,7 +199,6 @@ inthandler7: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -217,7 +210,6 @@ inthandler: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and #0x3ff, %d0
@@ -228,7 +220,6 @@ bra ret_from_interrupt ret_from_interrupt: - subql #1,local_irq_count jeq 1f 2: RESTORE_ALL
@@ -238,7 +229,6 @@ jhi 2b /* check if we need to do software interrupts */ - movel local_irq_count,%d0 jeq ret_from_exception pea ret_from_exception
arch/m68knommu/platform/68328/ints.c +21 -109
168 lines not on this page · raw message
arch/m68knommu/platform/68360/entry.S +2 -4
@@ -120,23 +120,21 @@ RESTORE_ALL /* - * This is the main interrupt handler, responsible for calling process_int() + * This is the main interrupt handler, responsible for calling do_IRQ() */ inthandler: SAVE_ALL - addql #1,local_irq_count /* put exception # in d0*/ movew %sp@(PT_VECTOR), %d0 and.l #0x3ff, %d0 lsr.l #0x02, %d0 movel %sp,%sp@- movel %d0,%sp@- /* put vector # on stack*/ - jbsr process_int /* process the IRQ*/ + jbsr do_IRQ /* process the IRQ*/ 3: addql #8,%sp /* pop parameters off stack*/ bra ret_from_interrupt ret_from_interrupt: - subql #1,local_irq_count jeq 1f 2: RESTORE_ALL
arch/m68knommu/platform/68360/ints.c +13 -220
278 lines not on this page · raw message
include/asm-m68knommu/irq.h +5 -70
87 lines not on this page · raw message
include/asm-m68knommu/irqnode.h +0 -36
@@ -1,36 +0,0 @@ -#ifndef _M68K_IRQNODE_H_ -#define _M68K_IRQNODE_H_ - -#include <linux/interrupt.h> - -/* -* This structure is used to chain together the ISRs for a particular -* interrupt source (if it supports chaining). -*/ -typedef struct irq_node { -irq_handler_t handler; -unsigned long flags; -void *dev_id; -const char *devname; -struct irq_node *next; -}irq_node_t ; - -/* -* This structure has only 4 elements for speed reasons -*/ -struct irq_entry { -irq_handler_t handler; -unsigned long flags; -void *dev_id; -const char *devname; -}; - -/* count of spurious interrupts */ -extern volatile unsigned int num_spurious; - -/* -* This function returns a new irq_node_t -*/ -extern irq_node_t *new_irq_node (void ); - -#endif /* _M68K_IRQNODE_H_ */
include/asm-m68knommu/m68360.h +8 -0
@@ -3,3 +3,11 @@#include "m68360_quicc.h" #include "m68360_enet.h" +#ifdef CONFIG_M68360 + +#define CPM_INTERRUPT 4 + +/* see MC68360 User's Manual, p. 7-377 */ +#define CPM_VECTOR_BASE 0x04/* 3 MSbits of CPM vector */ + +#endif /* CONFIG_M68360 */
include/asm-m68knommu/traps.h +4 -0
@@ -16,6 +16,10 @@typedef void (*e_vector )(void );extern e_vector vectors[]; +extern void init_vectors (void ); +extern void enable_vector (unsigned int irq); +extern void disable_vector (unsigned int irq); +extern void ack_vector (unsigned int irq);#endif