diff options
author | Wolfgang Denk <wd@denx.de> | 2007-05-16 00:11:53 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-05-16 00:11:53 +0200 |
commit | d6022573746856861f86f4f514dd1c1c14aaec9a (patch) | |
tree | 5d07b2e0f2acdb4e640aeb886f127c7a5c6c47b6 /cpu/microblaze/interrupts.c | |
parent | e73865897fe9e2b111d7f9ef32fe428438771b11 (diff) | |
parent | e69f66c6ebe82bbbd1da766bc4eda40ec7ee5af1 (diff) | |
download | u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.zip u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.tar.gz u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.tar.bz2 |
Merge with /home/wd/git/u-boot/custodian/u-boot-microblaze
Diffstat (limited to 'cpu/microblaze/interrupts.c')
-rwxr-xr-x[-rw-r--r--] | cpu/microblaze/interrupts.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/cpu/microblaze/interrupts.c b/cpu/microblaze/interrupts.c index 2db847c..b61153f 100644..100755 --- a/cpu/microblaze/interrupts.c +++ b/cpu/microblaze/interrupts.c @@ -27,6 +27,7 @@ #include <common.h> #include <command.h> #include <asm/microblaze_intc.h> +#include <asm/asm.h> #undef DEBUG_INT @@ -35,12 +36,12 @@ extern void microblaze_enable_interrupts (void); void enable_interrupts (void) { - microblaze_enable_interrupts (); + MSRSET(0x2); } int disable_interrupts (void) { - microblaze_disable_interrupts (); + MSRCLR(0x2); return 0; } @@ -48,6 +49,10 @@ int disable_interrupts (void) #ifdef CFG_TIMER_0 extern void timer_init (void); #endif +#ifdef CFG_FSL_2 +extern void fsl_init2 (void); +#endif + static struct irq_action vecs[CFG_INTC_0_NUM]; @@ -106,7 +111,6 @@ void install_interrupt_handler (int irq, interrupt_handler_t * hdlr, void *arg) act->count = 0; enable_one_interrupt (irq); } else { /* disable */ - act->handler = (interrupt_handler_t *) def_hdlr; act->arg = (void *)irq; disable_one_interrupt (irq); @@ -141,18 +145,22 @@ int interrupts_init (void) #ifdef CFG_TIMER_0 timer_init (); #endif +#ifdef CFG_FSL_2 + fsl_init2 (); +#endif enable_interrupts (); return 0; } void interrupt_handler (void) { - int irqs; - irqs = (intc->isr & intc->ier); /* find active interrupt */ - + int irqs = (intc->isr & intc->ier); /* find active interrupt */ + int i = 1; #ifdef DEBUG_INT + int value; printf ("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier, intc->iar, intc->mer); + R14(value); printf ("Interrupt handler on %x line, r14 %x\n", irqs, value); #endif struct irq_action *act = vecs; @@ -165,15 +173,19 @@ void interrupt_handler (void) #endif act->handler (act->arg); act->count++; + intc->iar = i; + return; } irqs >>= 1; act++; + i <<= 1; } - intc->iar = 0xFFFFFFFF; /* erase all events */ -#ifdef DEBUG + +#ifdef DEBUG_INT printf ("Dump INTC reg, isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier, intc->iar, intc->mer); - printf ("Interrupt handler on %x line, r14\n", irqs); + R14(value); + printf ("Interrupt handler on %x line, r14 %x\n", irqs, value); #endif } #endif |