Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 29647
b: refs/heads/master
c: 68387c4
h: refs/heads/master
i:
  29645: d5440be
  29643: cc024d3
  29639: 287c0f6
  29631: 27b7e3a
v: v3
  • Loading branch information
Roman Zippel authored and Linus Torvalds committed Jun 25, 2006
1 parent 92e4630 commit bd7b6b7
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 149 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b5dc7840b3ebe9c7967dd8ba73db957767009ff9
refs/heads/master: 68387c448b7f2b3e2bfa0f606391cd3b602b1997
11 changes: 8 additions & 3 deletions trunk/arch/m68k/kernel/entry.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
.globl sys_call_table
.globl sys_fork, sys_clone, sys_vfork
.globl ret_from_interrupt, bad_interrupt
.globl auto_irqhandler_fixup
.globl user_irqvec_fixup, user_irqhandler_fixup

.text
ENTRY(buserr)
Expand Down Expand Up @@ -212,6 +214,7 @@ ENTRY(auto_inthandler)
jbra 3f
1:
#endif
auto_irqhandler_fixup = . + 2
jsr m68k_handle_int | process the IRQ
3: addql #8,%sp | pop parameters off stack

Expand All @@ -234,17 +237,19 @@ ret_from_last_interrupt:

/* Handler for user defined interrupt vectors */

ENTRY(mach_inthandler)
ENTRY(user_inthandler)
SAVE_ALL_INT
GET_CURRENT(%d0)
addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
| put exception # in d0
bfextu %sp@(PT_VECTOR){#4,#10},%d0
user_irqvec_fixup = . + 2
subw #VEC_USER,%d0

movel %sp,%sp@-
movel %d0,%sp@- | put vector # on stack
movel mach_process_int,%a0
jsr %a0@ | process the IRQ
user_irqhandler_fixup = . + 2
jsr m68k_handle_int | process the IRQ
addql #8,%sp | pop parameters off stack

subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
Expand Down
240 changes: 152 additions & 88 deletions trunk/arch/m68k/kernel/ints.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,22 @@
#include <asm/traps.h>
#include <asm/page.h>
#include <asm/machdep.h>
#include <asm/cacheflush.h>

#ifdef CONFIG_Q40
#include <asm/q40ints.h>
#endif

extern u32 auto_irqhandler_fixup[];
extern u32 user_irqhandler_fixup[];
extern u16 user_irqvec_fixup[];

/* table for system interrupt handlers */
static struct irq_node *irq_list[SYS_IRQS];
static struct irq_controller *irq_controller[SYS_IRQS];
static struct irq_node *irq_list[NR_IRQS];
static struct irq_controller *irq_controller[NR_IRQS];
static int irq_depth[NR_IRQS];

static int m68k_first_user_vec;

static struct irq_controller auto_irq_controller = {
.name = "auto",
Expand All @@ -55,39 +63,16 @@ static struct irq_controller auto_irq_controller = {
.shutdown = m68k_irq_shutdown,
};

static const char *default_names[SYS_IRQS] = {
[0] = "spurious int",
[1] = "int1 handler",
[2] = "int2 handler",
[3] = "int3 handler",
[4] = "int4 handler",
[5] = "int5 handler",
[6] = "int6 handler",
[7] = "int7 handler"
static struct irq_controller user_irq_controller = {
.name = "user",
.lock = SPIN_LOCK_UNLOCKED,
.startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown,
};

/* The number of spurious interrupts */
volatile unsigned int num_spurious;

#define NUM_IRQ_NODES 100
static irq_node_t nodes[NUM_IRQ_NODES];

static void dummy_enable_irq(unsigned int irq);
static void dummy_disable_irq(unsigned int irq);
static int dummy_request_irq(unsigned int irq,
irqreturn_t (*handler) (int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id);
static void dummy_free_irq(unsigned int irq, void *dev_id);

void (*enable_irq) (unsigned int) = dummy_enable_irq;
void (*disable_irq) (unsigned int) = dummy_disable_irq;

int (*mach_request_irq) (unsigned int, irqreturn_t (*)(int, void *, struct pt_regs *),
unsigned long, const char *, void *) = dummy_request_irq;
void (*mach_free_irq) (unsigned int, void *) = dummy_free_irq;

void init_irq_proc(void);

/*
* void init_IRQ(void)
*
Expand All @@ -109,14 +94,70 @@ void __init init_IRQ(void)
hardirq_mask_is_broken();
}

for (i = IRQ_AUTO_1; i <= IRQ_AUTO_7; i++) {
for (i = IRQ_AUTO_1; i <= IRQ_AUTO_7; i++)
irq_controller[i] = &auto_irq_controller;
if (mach_default_handler && (*mach_default_handler)[i])
cpu_request_irq(i, (*mach_default_handler)[i],
0, default_names[i], NULL);
}

mach_init_IRQ ();
mach_init_IRQ();
}

/**
* m68k_setup_auto_interrupt
* @handler: called from auto vector interrupts
*
* setup the handler to be called from auto vector interrupts instead of the
* standard m68k_handle_int(), it will be called with irq numbers in the range
* from IRQ_AUTO_1 - IRQ_AUTO_7.
*/
void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *))
{
if (handler)
*auto_irqhandler_fixup = (u32)handler;
flush_icache();
}

/**
* m68k_setup_user_interrupt
* @vec: first user vector interrupt to handle
* @cnt: number of active user vector interrupts
* @handler: called from user vector interrupts
*
* setup user vector interrupts, this includes activating the specified range
* of interrupts, only then these interrupts can be requested (note: this is
* different from auto vector interrupts). An optional handler can be installed
* to be called instead of the default m68k_handle_int(), it will be called
* with irq numbers starting from IRQ_USER.
*/
void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
void (*handler)(unsigned int, struct pt_regs *))
{
int i;

m68k_first_user_vec = vec;
for (i = 0; i < cnt; i++)
irq_controller[IRQ_USER + i] = &user_irq_controller;
*user_irqvec_fixup = vec - IRQ_USER;
if (handler)
*user_irqhandler_fixup = (u32)handler;
flush_icache();
}

/**
* m68k_setup_irq_controller
* @contr: irq controller which controls specified irq
* @irq: first irq to be managed by the controller
*
* Change the controller for the specified range of irq, which will be used to
* manage these irq. auto/user irq already have a default controller, which can
* be changed as well, but the controller probably should use m68k_irq_startup/
* m68k_irq_shutdown.
*/
void m68k_setup_irq_controller(struct irq_controller *contr, unsigned int irq,
unsigned int cnt)
{
int i;

for (i = 0; i < cnt; i++)
irq_controller[irq + i] = contr;
}

irq_node_t *new_irq_node(void)
Expand All @@ -135,34 +176,13 @@ irq_node_t *new_irq_node(void)
return NULL;
}

/*
* We will keep these functions until I have convinced Linus to move
* the declaration of them from include/linux/sched.h to
* include/asm/irq.h.
*/
int request_irq(unsigned int irq,
irqreturn_t (*handler) (int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
return mach_request_irq(irq, handler, flags, devname, dev_id);
}

EXPORT_SYMBOL(request_irq);

void free_irq(unsigned int irq, void *dev_id)
{
mach_free_irq(irq, dev_id);
}

EXPORT_SYMBOL(free_irq);

int setup_irq(unsigned int irq, struct irq_node *node)
{
struct irq_controller *contr;
struct irq_node **prev;
unsigned long flags;

if (irq >= SYS_IRQS || !(contr = irq_controller[irq])) {
if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d from %s\n",
__FUNCTION__, irq, node->devname);
return -ENXIO;
Expand Down Expand Up @@ -195,9 +215,9 @@ int setup_irq(unsigned int irq, struct irq_node *node)
return 0;
}

int cpu_request_irq(unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
int request_irq(unsigned int irq,
irqreturn_t (*handler) (int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
struct irq_node *node;
int res;
Expand All @@ -218,13 +238,15 @@ int cpu_request_irq(unsigned int irq,
return res;
}

void cpu_free_irq(unsigned int irq, void *dev_id)
EXPORT_SYMBOL(request_irq);

void free_irq(unsigned int irq, void *dev_id)
{
struct irq_controller *contr;
struct irq_node **p, *node;
unsigned long flags;

if (irq >= SYS_IRQS || !(contr = irq_controller[irq])) {
if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
return;
}
Expand All @@ -245,23 +267,78 @@ void cpu_free_irq(unsigned int irq, void *dev_id)
printk("%s: Removing probably wrong IRQ %d\n",
__FUNCTION__, irq);

if (!irq_list[irq])
contr->shutdown(irq);
if (!irq_list[irq]) {
if (contr->shutdown)
contr->shutdown(irq);
else
contr->disable(irq);
}

spin_unlock_irqrestore(&contr->lock, flags);
}

EXPORT_SYMBOL(free_irq);

void enable_irq(unsigned int irq)
{
struct irq_controller *contr;
unsigned long flags;

if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d\n",
__FUNCTION__, irq);
return;
}

spin_lock_irqsave(&contr->lock, flags);
if (irq_depth[irq]) {
if (!--irq_depth[irq]) {
if (contr->enable)
contr->enable(irq);
}
} else
WARN_ON(1);
spin_unlock_irqrestore(&contr->lock, flags);
}

EXPORT_SYMBOL(enable_irq);

void disable_irq(unsigned int irq)
{
struct irq_controller *contr;
unsigned long flags;

if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
printk("%s: Incorrect IRQ %d\n",
__FUNCTION__, irq);
return;
}

spin_lock_irqsave(&contr->lock, flags);
if (!irq_depth[irq]++) {
if (contr->disable)
contr->disable(irq);
}
spin_unlock_irqrestore(&contr->lock, flags);
}

EXPORT_SYMBOL(disable_irq);

int m68k_irq_startup(unsigned int irq)
{
if (irq <= IRQ_AUTO_7)
vectors[VEC_SPUR + irq] = auto_inthandler;
else
vectors[m68k_first_user_vec + irq - IRQ_USER] = user_inthandler;
return 0;
}

void m68k_irq_shutdown(unsigned int irq)
{
if (irq <= IRQ_AUTO_7)
vectors[VEC_SPUR + irq] = bad_inthandler;
else
vectors[m68k_first_user_vec + irq - IRQ_USER] = bad_inthandler;
}


Expand Down Expand Up @@ -292,28 +369,16 @@ int probe_irq_off (unsigned long irqs)

EXPORT_SYMBOL(probe_irq_off);

static void dummy_enable_irq(unsigned int irq)
unsigned int irq_canonicalize(unsigned int irq)
{
printk("calling uninitialized enable_irq()\n");
}

static void dummy_disable_irq(unsigned int irq)
{
printk("calling uninitialized disable_irq()\n");
}

static int dummy_request_irq(unsigned int irq,
irqreturn_t (*handler) (int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
printk("calling uninitialized request_irq()\n");
return 0;
#ifdef CONFIG_Q40
if (MACH_IS_Q40 && irq == 11)
irq = 10;
#endif
return irq;
}

static void dummy_free_irq(unsigned int irq, void *dev_id)
{
printk("calling uninitialized disable_irq()\n");
}
EXPORT_SYMBOL(irq_canonicalize);

asmlinkage void m68k_handle_int(unsigned int irq, struct pt_regs *regs)
{
Expand All @@ -340,15 +405,14 @@ int show_interrupts(struct seq_file *p, void *v)
int i = *(loff_t *) v;

/* autovector interrupts */
if (i < SYS_IRQS && irq_list[i]) {
if (irq_list[i]) {
contr = irq_controller[i];
node = irq_list[i];
seq_printf(p, "%s %u: %10u %s", contr->name, i, kstat_cpu(0).irqs[i], node->devname);
seq_printf(p, "%-8s %3u: %10u %s", contr->name, i, kstat_cpu(0).irqs[i], node->devname);
while ((node = node->next))
seq_printf(p, ", %s", node->devname);
seq_puts(p, "\n");
} else if (i == SYS_IRQS)
mach_get_irq_list(p, v);
}
return 0;
}

Expand Down
Loading

0 comments on commit bd7b6b7

Please sign in to comment.