[PATCH] m68k: convert VME irq code

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roman Zippel
2006-06-25 05:47:06 -07:00
committed by Linus Torvalds
parent ebba61d5b0
commit 200a3d352c
12 changed files with 88 additions and 555 deletions
+1 -1
View File
@@ -2,4 +2,4 @@
# Makefile for Linux arch/m68k/bvme6000 source directory
#
obj-y := config.o bvmeints.o rtc.o
obj-y := config.o rtc.o
-161
View File
@@ -1,161 +0,0 @@
/*
* arch/m68k/bvme6000/bvmeints.c
*
* Copyright (C) 1997 Richard Hirst [richard@sleepie.demon.co.uk]
*
* based on amiints.c -- Amiga Linux interrupt handling code
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file README.legal in the main directory of this archive
* for more details.
*
*/
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/seq_file.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/traps.h>
static irqreturn_t bvme6000_defhand (int irq, void *dev_id, struct pt_regs *fp);
/*
* This should ideally be 4 elements only, for speed.
*/
static struct {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
unsigned count;
} irq_tab[256];
/*
* void bvme6000_init_IRQ (void)
*
* Parameters: None
*
* Returns: Nothing
*
* This function is called during kernel startup to initialize
* the bvme6000 IRQ handling routines.
*/
void bvme6000_init_IRQ (void)
{
int i;
for (i = 0; i < 256; i++) {
irq_tab[i].handler = bvme6000_defhand;
irq_tab[i].flags = IRQ_FLG_STD;
irq_tab[i].dev_id = NULL;
irq_tab[i].devname = NULL;
irq_tab[i].count = 0;
}
}
int bvme6000_request_irq(unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
if (irq > 255) {
printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
return -ENXIO;
}
#if 0
/* Nothing special about auto-vectored devices for the BVME6000,
* but treat it specially to avoid changes elsewhere.
*/
if (irq >= VEC_INT1 && irq <= VEC_INT7)
return cpu_request_irq(irq - VEC_SPUR, handler, flags,
devname, dev_id);
#endif
if (!(irq_tab[irq].flags & IRQ_FLG_STD)) {
if (irq_tab[irq].flags & IRQ_FLG_LOCK) {
printk("%s: IRQ %d from %s is not replaceable\n",
__FUNCTION__, irq, irq_tab[irq].devname);
return -EBUSY;
}
if (flags & IRQ_FLG_REPLACE) {
printk("%s: %s can't replace IRQ %d from %s\n",
__FUNCTION__, devname, irq, irq_tab[irq].devname);
return -EBUSY;
}
}
irq_tab[irq].handler = handler;
irq_tab[irq].flags = flags;
irq_tab[irq].dev_id = dev_id;
irq_tab[irq].devname = devname;
return 0;
}
void bvme6000_free_irq(unsigned int irq, void *dev_id)
{
if (irq > 255) {
printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
return;
}
#if 0
if (irq >= VEC_INT1 && irq <= VEC_INT7) {
cpu_free_irq(irq - VEC_SPUR, dev_id);
return;
}
#endif
if (irq_tab[irq].dev_id != dev_id)
printk("%s: Removing probably wrong IRQ %d from %s\n",
__FUNCTION__, irq, irq_tab[irq].devname);
irq_tab[irq].handler = bvme6000_defhand;
irq_tab[irq].flags = IRQ_FLG_STD;
irq_tab[irq].dev_id = NULL;
irq_tab[irq].devname = NULL;
}
irqreturn_t bvme6000_process_int (unsigned long vec, struct pt_regs *fp)
{
if (vec > 255) {
printk ("bvme6000_process_int: Illegal vector %ld", vec);
return IRQ_NONE;
} else {
irq_tab[vec].count++;
irq_tab[vec].handler(vec, irq_tab[vec].dev_id, fp);
return IRQ_HANDLED;
}
}
int show_bvme6000_interrupts(struct seq_file *p, void *v)
{
int i;
for (i = 0; i < 256; i++) {
if (irq_tab[i].count)
seq_printf(p, "Vec 0x%02x: %8d %s\n",
i, irq_tab[i].count,
irq_tab[i].devname ? irq_tab[i].devname : "free");
}
return 0;
}
static irqreturn_t bvme6000_defhand (int irq, void *dev_id, struct pt_regs *fp)
{
printk ("Unknown interrupt 0x%02x\n", irq);
return IRQ_NONE;
}
void bvme6000_enable_irq (unsigned int irq)
{
}
void bvme6000_disable_irq (unsigned int irq)
{
}
+8 -13
View File
@@ -36,15 +36,8 @@
#include <asm/machdep.h>
#include <asm/bvme6000hw.h>
extern irqreturn_t bvme6000_process_int (int level, struct pt_regs *regs);
extern void bvme6000_init_IRQ (void);
extern void bvme6000_free_irq (unsigned int, void *);
extern int show_bvme6000_interrupts(struct seq_file *, void *);
extern void bvme6000_enable_irq (unsigned int);
extern void bvme6000_disable_irq (unsigned int);
static void bvme6000_get_model(char *model);
static int bvme6000_get_hardware_list(char *buffer);
extern int bvme6000_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);
extern void bvme6000_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
extern unsigned long bvme6000_gettimeoffset (void);
extern int bvme6000_hwclk (int, struct rtc_time *);
@@ -100,6 +93,14 @@ static int bvme6000_get_hardware_list(char *buffer)
return 0;
}
/*
* This function is called during kernel startup to initialize
* the bvme6000 IRQ handling routines.
*/
static void bvme6000_init_IRQ(void)
{
m68k_setup_user_interrupt(VEC_USER, 192, NULL);
}
void __init config_bvme6000(void)
{
@@ -127,12 +128,6 @@ void __init config_bvme6000(void)
mach_hwclk = bvme6000_hwclk;
mach_set_clock_mmss = bvme6000_set_clock_mmss;
mach_reset = bvme6000_reset;
mach_free_irq = bvme6000_free_irq;
mach_process_int = bvme6000_process_int;
mach_get_irq_list = show_bvme6000_interrupts;
mach_request_irq = bvme6000_request_irq;
enable_irq = bvme6000_enable_irq;
disable_irq = bvme6000_disable_irq;
mach_get_model = bvme6000_get_model;
mach_get_hardware_list = bvme6000_get_hardware_list;
-146
View File
@@ -1,146 +0,0 @@
/*
* arch/m68k/mvme147/147ints.c
*
* Copyright (C) 1997 Richard Hirst [richard@sleepie.demon.co.uk]
*
* based on amiints.c -- Amiga Linux interrupt handling code
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file README.legal in the main directory of this archive
* for more details.
*
*/
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/seq_file.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/traps.h>
static irqreturn_t mvme147_defhand (int irq, void *dev_id, struct pt_regs *fp);
/*
* This should ideally be 4 elements only, for speed.
*/
static struct {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
unsigned count;
} irq_tab[256];
/*
* void mvme147_init_IRQ (void)
*
* Parameters: None
*
* Returns: Nothing
*
* This function is called during kernel startup to initialize
* the mvme147 IRQ handling routines.
*/
void mvme147_init_IRQ (void)
{
int i;
for (i = 0; i < 256; i++) {
irq_tab[i].handler = mvme147_defhand;
irq_tab[i].flags = IRQ_FLG_STD;
irq_tab[i].dev_id = NULL;
irq_tab[i].devname = NULL;
irq_tab[i].count = 0;
}
}
int mvme147_request_irq(unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
if (irq > 255) {
printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
return -ENXIO;
}
if (!(irq_tab[irq].flags & IRQ_FLG_STD)) {
if (irq_tab[irq].flags & IRQ_FLG_LOCK) {
printk("%s: IRQ %d from %s is not replaceable\n",
__FUNCTION__, irq, irq_tab[irq].devname);
return -EBUSY;
}
if (flags & IRQ_FLG_REPLACE) {
printk("%s: %s can't replace IRQ %d from %s\n",
__FUNCTION__, devname, irq, irq_tab[irq].devname);
return -EBUSY;
}
}
irq_tab[irq].handler = handler;
irq_tab[irq].flags = flags;
irq_tab[irq].dev_id = dev_id;
irq_tab[irq].devname = devname;
return 0;
}
void mvme147_free_irq(unsigned int irq, void *dev_id)
{
if (irq > 255) {
printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
return;
}
if (irq_tab[irq].dev_id != dev_id)
printk("%s: Removing probably wrong IRQ %d from %s\n",
__FUNCTION__, irq, irq_tab[irq].devname);
irq_tab[irq].handler = mvme147_defhand;
irq_tab[irq].flags = IRQ_FLG_STD;
irq_tab[irq].dev_id = NULL;
irq_tab[irq].devname = NULL;
}
irqreturn_t mvme147_process_int (unsigned long vec, struct pt_regs *fp)
{
if (vec > 255) {
printk ("mvme147_process_int: Illegal vector %ld\n", vec);
return IRQ_NONE;
} else {
irq_tab[vec].count++;
irq_tab[vec].handler(vec, irq_tab[vec].dev_id, fp);
return IRQ_HANDLED;
}
}
int show_mvme147_interrupts (struct seq_file *p, void *v)
{
int i;
for (i = 0; i < 256; i++) {
if (irq_tab[i].count)
seq_printf(p, "Vec 0x%02x: %8d %s\n",
i, irq_tab[i].count,
irq_tab[i].devname ? irq_tab[i].devname : "free");
}
return 0;
}
static irqreturn_t mvme147_defhand (int irq, void *dev_id, struct pt_regs *fp)
{
printk ("Unknown interrupt 0x%02x\n", irq);
return IRQ_NONE;
}
void mvme147_enable_irq (unsigned int irq)
{
}
void mvme147_disable_irq (unsigned int irq)
{
}
+1 -1
View File
@@ -2,4 +2,4 @@
# Makefile for Linux arch/m68k/mvme147 source directory
#
obj-y := config.o 147ints.o
obj-y := config.o
+9 -13
View File
@@ -36,15 +36,8 @@
#include <asm/mvme147hw.h>
extern irqreturn_t mvme147_process_int (int level, struct pt_regs *regs);
extern void mvme147_init_IRQ (void);
extern void mvme147_free_irq (unsigned int, void *);
extern int show_mvme147_interrupts (struct seq_file *, void *);
extern void mvme147_enable_irq (unsigned int);
extern void mvme147_disable_irq (unsigned int);
static void mvme147_get_model(char *model);
static int mvme147_get_hardware_list(char *buffer);
extern int mvme147_request_irq (unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);
extern void mvme147_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
extern unsigned long mvme147_gettimeoffset (void);
extern int mvme147_hwclk (int, struct rtc_time *);
@@ -91,6 +84,15 @@ static int mvme147_get_hardware_list(char *buffer)
return 0;
}
/*
* This function is called during kernel startup to initialize
* the mvme147 IRQ handling routines.
*/
void mvme147_init_IRQ(void)
{
m68k_setup_user_interrupt(VEC_USER, 192, NULL);
}
void __init config_mvme147(void)
{
@@ -101,12 +103,6 @@ void __init config_mvme147(void)
mach_hwclk = mvme147_hwclk;
mach_set_clock_mmss = mvme147_set_clock_mmss;
mach_reset = mvme147_reset;
mach_free_irq = mvme147_free_irq;
mach_process_int = mvme147_process_int;
mach_get_irq_list = show_mvme147_interrupts;
mach_request_irq = mvme147_request_irq;
enable_irq = mvme147_enable_irq;
disable_irq = mvme147_disable_irq;
mach_get_model = mvme147_get_model;
mach_get_hardware_list = mvme147_get_hardware_list;
-150
View File
@@ -1,150 +0,0 @@
/*
* arch/m68k/mvme16x/16xints.c
*
* Copyright (C) 1995 Richard Hirst [richard@sleepie.demon.co.uk]
*
* based on amiints.c -- Amiga Linux interrupt handling code
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file README.legal in the main directory of this archive
* for more details.
*
*/
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/seq_file.h>
#include <asm/system.h>
#include <asm/ptrace.h>
#include <asm/irq.h>
static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp);
/*
* This should ideally be 4 elements only, for speed.
*/
static struct {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
unsigned count;
} irq_tab[192];
/*
* void mvme16x_init_IRQ (void)
*
* Parameters: None
*
* Returns: Nothing
*
* This function is called during kernel startup to initialize
* the mvme16x IRQ handling routines. Should probably ensure
* that the base vectors for the VMEChip2 and PCCChip2 are valid.
*/
void mvme16x_init_IRQ (void)
{
int i;
for (i = 0; i < 192; i++) {
irq_tab[i].handler = mvme16x_defhand;
irq_tab[i].flags = IRQ_FLG_STD;
irq_tab[i].dev_id = NULL;
irq_tab[i].devname = NULL;
irq_tab[i].count = 0;
}
}
int mvme16x_request_irq(unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
if (irq < 64 || irq > 255) {
printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);
return -ENXIO;
}
if (!(irq_tab[irq-64].flags & IRQ_FLG_STD)) {
if (irq_tab[irq-64].flags & IRQ_FLG_LOCK) {
printk("%s: IRQ %d from %s is not replaceable\n",
__FUNCTION__, irq, irq_tab[irq-64].devname);
return -EBUSY;
}
if (flags & IRQ_FLG_REPLACE) {
printk("%s: %s can't replace IRQ %d from %s\n",
__FUNCTION__, devname, irq, irq_tab[irq-64].devname);
return -EBUSY;
}
}
irq_tab[irq-64].handler = handler;
irq_tab[irq-64].flags = flags;
irq_tab[irq-64].dev_id = dev_id;
irq_tab[irq-64].devname = devname;
return 0;
}
void mvme16x_free_irq(unsigned int irq, void *dev_id)
{
if (irq < 64 || irq > 255) {
printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
return;
}
if (irq_tab[irq-64].dev_id != dev_id)
printk("%s: Removing probably wrong IRQ %d from %s\n",
__FUNCTION__, irq, irq_tab[irq-64].devname);
irq_tab[irq-64].handler = mvme16x_defhand;
irq_tab[irq-64].flags = IRQ_FLG_STD;
irq_tab[irq-64].dev_id = NULL;
irq_tab[irq-64].devname = NULL;
}
irqreturn_t mvme16x_process_int (unsigned long vec, struct pt_regs *fp)
{
if (vec < 64 || vec > 255) {
printk ("mvme16x_process_int: Illegal vector %ld", vec);
return IRQ_NONE;
} else {
irq_tab[vec-64].count++;
irq_tab[vec-64].handler(vec, irq_tab[vec-64].dev_id, fp);
return IRQ_HANDLED;
}
}
int show_mvme16x_interrupts (struct seq_file *p, void *v)
{
int i;
for (i = 0; i < 192; i++) {
if (irq_tab[i].count)
seq_printf(p, "Vec 0x%02x: %8d %s\n",
i+64, irq_tab[i].count,
irq_tab[i].devname ? irq_tab[i].devname : "free");
}
return 0;
}
static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp)
{
printk ("Unknown interrupt 0x%02x\n", irq);
return IRQ_NONE;
}
void mvme16x_enable_irq (unsigned int irq)
{
}
void mvme16x_disable_irq (unsigned int irq)
{
}
+1 -1
View File
@@ -2,4 +2,4 @@
# Makefile for Linux arch/m68k/mvme16x source directory
#
obj-y := config.o 16xints.o rtc.o mvme16x_ksyms.o
obj-y := config.o rtc.o mvme16x_ksyms.o
+10 -13
View File
@@ -40,15 +40,8 @@ extern t_bdid mvme_bdid;
static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
extern irqreturn_t mvme16x_process_int (int level, struct pt_regs *regs);
extern void mvme16x_init_IRQ (void);
extern void mvme16x_free_irq (unsigned int, void *);
extern int show_mvme16x_interrupts (struct seq_file *, void *);
extern void mvme16x_enable_irq (unsigned int);
extern void mvme16x_disable_irq (unsigned int);
static void mvme16x_get_model(char *model);
static int mvme16x_get_hardware_list(char *buffer);
extern int mvme16x_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);
extern void mvme16x_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
extern unsigned long mvme16x_gettimeoffset (void);
extern int mvme16x_hwclk (int, struct rtc_time *);
@@ -120,6 +113,16 @@ static int mvme16x_get_hardware_list(char *buffer)
return (len);
}
/*
* This function is called during kernel startup to initialize
* the mvme16x IRQ handling routines. Should probably ensure
* that the base vectors for the VMEChip2 and PCCChip2 are valid.
*/
static void mvme16x_init_IRQ (void)
{
m68k_setup_user_interrupt(VEC_USER, 192, NULL);
}
#define pcc2chip ((volatile u_char *)0xfff42000)
#define PccSCCMICR 0x1d
@@ -138,12 +141,6 @@ void __init config_mvme16x(void)
mach_hwclk = mvme16x_hwclk;
mach_set_clock_mmss = mvme16x_set_clock_mmss;
mach_reset = mvme16x_reset;
mach_free_irq = mvme16x_free_irq;
mach_process_int = mvme16x_process_int;
mach_get_irq_list = show_mvme16x_interrupts;
mach_request_irq = mvme16x_request_irq;
enable_irq = mvme16x_enable_irq;
disable_irq = mvme16x_disable_irq;
mach_get_model = mvme16x_get_model;
mach_get_hardware_list = mvme16x_get_hardware_list;