diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2013-01-11 13:31:57 +0100 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2013-01-11 15:41:11 +0100 |
| commit | 2ef7a549d57c984fee2cd26fbaa70bbfa054dfb4 (patch) | |
| tree | 9936fc8a99d40c534b6d25bee4d1be924e3051db | |
| parent | efe104275960deccee71ff44c1bba38c997553f3 (diff) | |
| download | rockbox-2ef7a549d57c984fee2cd26fbaa70bbfa054dfb4.tar.gz rockbox-2ef7a549d57c984fee2cd26fbaa70bbfa054dfb4.zip | |
rk27xx: optimize irq_handler()
Change-Id: Idd3141e57b70e9b28b91748bc71208d9afffcd57
Reviewed-on: http://gerrit.rockbox.org/381
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Tested-by: Marcin Bukat <marcin.bukat@gmail.com>
| -rw-r--r-- | firmware/target/arm/rk27xx/system-rk27xx.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/firmware/target/arm/rk27xx/system-rk27xx.c b/firmware/target/arm/rk27xx/system-rk27xx.c index 327ef73422..20d0226892 100644 --- a/firmware/target/arm/rk27xx/system-rk27xx.c +++ b/firmware/target/arm/rk27xx/system-rk27xx.c @@ -65,7 +65,7 @@ default_interrupt(INT_SW_INT1); default_interrupt(INT_SW_INT2); default_interrupt(INT_SW_INT3); -static void (* const irqvector[])(void) = +static void (* const irqvector[])(void) USED_ATTR = { INT_UART0,INT_UART1,INT_TIMER0,INT_TIMER1,INT_TIMER2,INT_GPIO0,INT_SW_INT0,INT_AHB0_MAILBOX, INT_RTC,INT_SCU,INT_SD,INT_SPI,INT_HDMA,INT_A2A_BRIDGE,INT_I2C,INT_I2S, @@ -89,23 +89,18 @@ static void UIRQ(void) void irq_handler(void) { - /* - * Based on: linux/arch/arm/kernel/entry-armv.S and system-meg-fx.c - */ - - asm volatile( "stmfd sp!, {r0-r7, ip, lr} \n" /* Store context */ - "sub sp, sp, #8 \n"); /* Reserve stack */ - - int irq_no = INTC_ISR & 0x1f; - - irqvector[irq_no](); - - /* clear interrupt */ - INTC_ICCR = (1 << irq_no); - - asm volatile( "add sp, sp, #8 \n" /* Cleanup stack */ - "ldmfd sp!, {r0-r7, ip, lr} \n" /* Restore context */ - "subs pc, lr, #4 \n"); /* Return from IRQ */ + asm volatile("stmfd sp!, {r0-r5, ip, lr} \n" /* store context */ + "ldr r4, =0x18080000 \n" /* INTC base */ + "ldr r5, [r4, #0x104] \n" /* INTC_ISR */ + "and r5, r5, #0x1f \n" /* irq_no = INTC_ISR & 0x1f */ + "ldr r3, =irqvector \n" + "ldr r3,[r3, r5, lsl #2] \n" + "blx r3 \n" /* irqvector[irq_no]() */ + "mov r3, #1 \n" + "lsl r5, r3, r5 \n" /* clear interrupt */ + "str r5, [r4, #0x118] \n" /* INTC_ICCR = (1<<irq_no) */ + "ldmfd sp!, {r0-r5, ip, lr} \n" /* restore context */ + "subs pc, lr, #4 \n"); } void fiq_dummy(void) |