From: Kees Jongenburger Date: Thu, 23 May 2013 12:25:14 +0000 (+0200) Subject: arm:interupt handling remove hardcoded base address. X-Git-Tag: v3.3.0~966 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=refs%2Fchanges%2F84%2F584%2F4;p=minix.git arm:interupt handling remove hardcoded base address. Remove hardcoded base address for the omap interrupt handler and add interrupt names for AM335X in omap_intr.h. Change-Id: Ie606d8612f55990d55f9db655583052f53950e8e --- diff --git a/kernel/arch/earm/mpx.S b/kernel/arch/earm/mpx.S index dba2b8446..77b7d9d07 100644 --- a/kernel/arch/earm/mpx.S +++ b/kernel/arch/earm/mpx.S @@ -136,20 +136,11 @@ irq_entry_from_user: mov fp, #0 /* for stack trace */ bl _C_LABEL(context_stop) - /* get irq num */ - ldr r3, =OMAP3_INTR_SIR_IRQ - ldr r0, [r3] - and r0, r0, #OMAP3_INTR_ACTIVEIRQ_MASK /* irq */ /* call handler */ - bl _C_LABEL(irq_handle) /* irq_handle(irq) */ + bl _C_LABEL(omap3_irq_handle) /* omap3_irq_handle(void) */ pop {fp} /* caller proc ptr */ - /* allow new interrupts */ - mov r1, #OMAP3_INTR_NEWIRQAGR - ldr r3, =OMAP3_INTR_CONTROL - str r1, [r3] - /* data synchronization barrier */ dsb @@ -159,17 +150,8 @@ irq_entry_from_kernel: push {r0-r12, lr} bl _C_LABEL(context_stop_idle) - /* get irq num */ - ldr r3, =OMAP3_INTR_SIR_IRQ - ldr r0, [r3] - and r0, r0, #OMAP3_INTR_ACTIVEIRQ_MASK /* irq */ /* call handler */ - bl _C_LABEL(irq_handle) /* irq_handle(irq) */ - - /* allow new interrupts */ - mov r1, #OMAP3_INTR_NEWIRQAGR - ldr r3, =OMAP3_INTR_CONTROL - str r1, [r3] + bl _C_LABEL(omap3_irq_handle) /* omap3_irq_handle(void) */ /* data synchronization barrier */ dsb diff --git a/kernel/arch/earm/omap_intr.c b/kernel/arch/earm/omap_intr.c index 14c0b3283..4cf778202 100644 --- a/kernel/arch/earm/omap_intr.c +++ b/kernel/arch/earm/omap_intr.c @@ -1,19 +1,42 @@ #include #include +#include #include #include "omap_intr.h" +static struct omap_intr { + vir_bytes base; +} omap_intr; + int intr_init(const int auto_eoi) { +#ifdef DM37XX + omap_intr.base = OMAP3_DM37XX_INTR_BASE; +#endif +#ifdef AM335X + omap_intr.base = OMAP3_AM335X_INTR_BASE; +#endif return 0; } +void omap3_irq_handle(void) { + /* Function called from assembly to handle interrupts */ + + /* get irq */ + int irq = mmio_read(omap_intr.base + OMAP3_INTCPS_SIR_IRQ) & OMAP3_INTR_ACTIVEIRQ_MASK; + /* handle irq */ + irq_handle(irq); + /* re-enable. this should not trigger interrupts due to current cpsr state */ + mmio_write(omap_intr.base + OMAP3_INTCPS_CONTROL,OMAP3_INTR_NEWIRQAGR); + +} + void omap3_irq_unmask(int irq) { - mmio_write(OMAP3_INTR_MIR_CLEAR(irq >> 5), 1 << (irq & 0x1f)); + mmio_write(OMAP3_INTR_MIR_CLEAR(omap_intr.base, irq >> 5), 1 << (irq & 0x1f)); } void omap3_irq_mask(const int irq) { - mmio_write(OMAP3_INTR_MIR_SET(irq >> 5), 1 << (irq & 0x1f)); + mmio_write(OMAP3_INTR_MIR_SET(omap_intr.base, irq >> 5), 1 << (irq & 0x1f)); } diff --git a/kernel/arch/earm/omap_intr.h b/kernel/arch/earm/omap_intr.h index 98f6e5cea..32e7eaca7 100644 --- a/kernel/arch/earm/omap_intr.h +++ b/kernel/arch/earm/omap_intr.h @@ -1,8 +1,16 @@ #ifndef _OMAP_INTR_H #define _OMAP_INTR_H +#ifdef DM37XX /* Interrupt controller memory map */ -#define OMAP3_INTR_BASE 0x48200000 /* INTCPS physical address */ +#define OMAP3_DM37XX_INTR_BASE 0x48200000 /* INTCPS physical address */ + +#endif /* DM37XX */ + +#ifdef AM335X +/* Interrupt controller memory map */ +#define OMAP3_AM335X_INTR_BASE 0x48200000 /* INTCPS physical address */ +#endif /* AM335X */ /* Interrupt controller registers */ #define OMAP3_INTCPS_REVISION 0x000 /* IP revision code */ @@ -27,41 +35,33 @@ #define OMAP3_INTCPS_ILR0 0x100 /* Priority for interrupts */ -#define OMAP3_INTR_REVISION (OMAP3_INTR_BASE + OMAP3_INTCPS_REVISION) -#define OMAP3_INTR_SYSCONFIG (OMAP3_INTR_BASE + OMAP3_INTCPS_SYSCONFIG) -#define OMAP3_INTR_SYSSTATUS (OMAP3_INTR_BASE + OMAP3_INTCPS_SYSSTATUS) -#define OMAP3_INTR_SIR_IRQ (OMAP3_INTR_BASE + OMAP3_INTCPS_SIR_IRQ) -#define OMAP3_INTR_SIR_FIQ (OMAP3_INTR_BASE + OMAP3_INTCPS_SIR_FIQ) -#define OMAP3_INTR_CONTROL (OMAP3_INTR_BASE + OMAP3_INTCPS_CONTROL) -#define OMAP3_INTR_PROTECTION (OMAP3_INTR_BASE + OMAP3_INTCPS_PROTECTION) -#define OMAP3_INTR_IDLE (OMAP3_INTR_BASE + OMAP3_INTCPS_IDLE) -#define OMAP3_INTR_IRQ_PRIORITY (OMAP3_INTR_BASE + OMAP3_INTCPS_IRQ_PRIORITY) -#define OMAP3_INTR_FIQ_PRIORITY (OMAP3_INTR_BASE + OMAP3_INTCPS_FIQ_PRIORITY) -#define OMAP3_INTR_THRESHOLD (OMAP3_INTR_BASE + OMAP3_INTCPS_THRESHOLD) - -#define OMAP3_INTR_ITR(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_ITR0 + 0x20 * (n)) -#define OMAP3_INTR_MIR(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_MIR0 + 0x20 * (n)) -#define OMAP3_INTR_MIR_CLEAR(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_MIR_CLEAR0 + 0x20 * (n)) -#define OMAP3_INTR_MIR_SET(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_MIR_SET0 + 0x20 * (n)) -#define OMAP3_INTR_ISR_SET(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_ISR_SET0 + 0x20 * (n)) -#define OMAP3_INTR_ISR_CLEAR(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_ISR_CLEAR0 + 0x20 * (n)) -#define OMAP3_INTR_PENDING_IRQ(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_PENDING_IRQ0 + 0x20 * (n)) -#define OMAP3_INTR_PENDING_FIQ(n) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_PENDING_FIQ0 + 0x20 * (n)) -#define OMAP3_INTR_ILR(m) \ - (OMAP3_INTR_BASE + OMAP3_INTCPS_ILR0 + 0x4 * (m)) +#define OMAP3_INTR_ITR(base,n) \ + (base + OMAP3_INTCPS_ITR0 + 0x20 * (n)) +#define OMAP3_INTR_MIR(base,n) \ + (base + OMAP3_INTCPS_MIR0 + 0x20 * (n)) +#define OMAP3_INTR_MIR_CLEAR(base,n) \ + (base + OMAP3_INTCPS_MIR_CLEAR0 + 0x20 * (n)) +#define OMAP3_INTR_MIR_SET(base,n) \ + (base + OMAP3_INTCPS_MIR_SET0 + 0x20 * (n)) +#define OMAP3_INTR_ISR_SET(base,n) \ + (base + OMAP3_INTCPS_ISR_SET0 + 0x20 * (n)) +#define OMAP3_INTR_ISR_CLEAR(base,n) \ + (base + OMAP3_INTCPS_ISR_CLEAR0 + 0x20 * (n)) +#define OMAP3_INTR_PENDING_IRQ(base,n) \ + (base + OMAP3_INTCPS_PENDING_IRQ0 + 0x20 * (n)) +#define OMAP3_INTR_PENDING_FIQ(base,n) \ + (base + OMAP3_INTCPS_PENDING_FIQ0 + 0x20 * (n)) +#define OMAP3_INTR_ILR(base,m) \ + (base + OMAP3_INTCPS_ILR0 + 0x4 * (m)) #define OMAP3_INTR_ACTIVEIRQ_MASK 0x7f /* Active IRQ mask for SIR_IRQ */ #define OMAP3_INTR_NEWIRQAGR 0x1 /* New IRQ Generation */ -#define OMAP3_NR_IRQ_VECTORS 96 + + +#ifdef DM37XX + +#define OMAP3_DM337X_NR_IRQ_VECTORS 96 /* Interrupt mappings */ #define OMAP3_MCBSP2_ST_IRQ 4 /* Sidestone McBSP2 overflow */ @@ -135,6 +135,111 @@ #define OMAP3_HSUSB_DMA_IRQ 93 /* High-speed USB OTG DMA */ #define OMAP3_MMC3_IRQ 94 /* MMC/SD module 3 */ +#endif + +#ifdef AM335X +#define AM335X_INT_EMUINT 0 /* Emulation interrupt (EMUICINTR) */ +#define AM335X_INT_COMMTX 1 /* CortexA8 COMMTX */ +#define AM335X_INT_COMMRX 2 /* CortexA8 COMMRX */ +#define AM335X_INT_BENCH 3 /* CortexA8 NPMUIRQ */ +#define AM335X_INT_ELM_IRQ 4 /* Sinterrupt (Error location process completion) */ +#define AM335X_INT_NMI 7 /* nmi_int */ +#define AM335X_INT_L3DEBUG 9 /* l3_FlagMux_top_FlagOut1 */ +#define AM335X_INT_L3APPINT 10 /* l3_FlagMux_top_FlagOut0 */ +#define AM335X_INT_PRCMINT 11 /* irq_mpu */ +#define AM335X_INT_EDMACOMPINT 12 /* tpcc_int_pend_po0 */ +#define AM335X_INT_EDMAMPERR 13 /* tpcc_mpint_pend_po */ +#define AM335X_INT_EDMAERRINT 14 /* tpcc_errint_pend_po */ +#define AM335X_INT_ADC_TSC_GENINT 16 /* gen_intr_pend */ +#define AM335X_INT_USBSSINT 17 /* usbss_intr_pend */ +#define AM335X_INT_USB0 18 /* usb0_intr_pend */ +#define AM335X_INT_USB1 19 /* usb1_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT0 20 /* pr1_host_intr0_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT1 21 /* pr1_host_intr1_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT2 22 /* pr1_host_intr2_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT3 23 /* pr1_host_intr3_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT4 24 /* pr1_host_intr4_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT5 25 /* pr1_host_intr5_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT6 26 /* pr1_host_intr6_intr_pend */ +#define AM335X_INT_PRUSS1_EVTOUT7 27 /* pr1_host_intr7_intr_pend */ +#define AM335X_INT_MMCSD1INT 28 /* MMCSD1 SINTERRUPTN */ +#define AM335X_INT_MMCSD2INT 29 /* MMCSD2 SINTERRUPT */ +#define AM335X_INT_I2C2INT 30 /* I2C2 POINTRPEND */ +#define AM335X_INT_eCAP0INT 31 /* ecap_intr_intr_pend */ +#define AM335X_INT_GPIOINT2A 32 /* GPIO 2 POINTRPEND1 */ +#define AM335X_INT_GPIOINT2B 33 /* GPIO 2 POINTRPEND2 */ +#define AM335X_INT_USBWAKEUP 34 /* USBSS slv0p_Swakeup */ +#define AM335X_INT_LCDCINT 36 /* LCDC lcd_irq */ +#define AM335X_INT_GFXINT 37 /* SGX530 THALIAIRQ */ +#define AM335X_INT_ePWM2INT 39 /* (PWM Subsystem) epwm_intr_intr_pend */ +#define AM335X_INT_3PGSWRXTHR0 40 /* (Ethernet) c0_rx_thresh_pend (RX_THRESH_PULSE) */ +#define AM335X_INT_3PGSWRXINT0 41 /* CPSW (Ethernet) c0_rx_pend */ +#define AM335X_INT_3PGSWTXINT0 42 /* CPSW (Ethernet) c0_tx_pend */ +#define AM335X_INT_3PGSWMISC0 43 /* CPSW (Ethernet) c0_misc_pend */ +#define AM335X_INT_UART3INT 44 /* UART3 niq */ +#define AM335X_INT_UART4INT 45 /* UART4 niq */ +#define AM335X_INT_UART5INT 46 /* UART5 niq */ +#define AM335X_INT_eCAP1INT 47 /* (PWM Subsystem) ecap_intr_intr_pend */ +#define AM335X_INT_DCAN0_INT0 52 /* DCAN0 dcan_intr0_intr_pend */ +#define AM335X_INT_DCAN0_INT1 53 /* DCAN0 dcan_intr1_intr_pend */ +#define AM335X_INT_DCAN0_PARITY 54 /* DCAN0 dcan_uerr_intr_pend */ +#define AM335X_INT_DCAN1_INT0 55 /* DCAN1 dcan_intr0_intr_pend */ +#define AM335X_INT_DCAN1_INT1 56 /* DCAN1 dcan_intr1_intr_pend */ +#define AM335X_INT_DCAN1_PARITY 57 /* DCAN1 dcan_uerr_intr_pend */ +#define AM335X_INT_ePWM0_TZINT 58 /* eHRPWM0 TZ interrupt (PWM epwm_tz_intr_pend Subsystem) */ +#define AM335X_INT_ePWM1_TZINT 59 /* eHRPWM1 TZ interrupt (PWM epwm_tz_intr_pend Subsystem) */ +#define AM335X_INT_ePWM2_TZINT 60 /* eHRPWM2 TZ interrupt (PWM epwm_tz_intr_pend Subsystem) */ +#define AM335X_INT_eCAP2INT 61 /* eCAP2 (PWM Subsystem) ecap_intr_intr_pend */ +#define AM335X_INT_GPIOINT3A 62 /* GPIO 3 POINTRPEND1 */ +#define AM335X_INT_GPIOINT3B 63 /* GPIO 3 POINTRPEND2 */ +#define AM335X_INT_MMCSD0INT 64 /* MMCSD0 SINTERRUPTN */ +#define AM335X_INT_SPI0INT 65 /* McSPI0 SINTERRUPTN */ +#define AM335X_INT_TINT0 66 /* Timer0 POINTR_PEND */ +#define AM335X_INT_TINT1_1MS 67 /* DMTIMER_1ms POINTR_PEND */ +#define AM335X_INT_TINT2 68 /* DMTIMER2 POINTR_PEND */ +#define AM335X_INT_TINT3 69 /* DMTIMER3 POINTR_PEND */ +#define AM335X_INT_I2C0INT 70 /* I2C0 POINTRPEND */ +#define AM335X_INT_I2C1INT 71 /* I2C1 POINTRPEND */ +#define AM335X_INT_UART0INT 72 /* UART0 niq */ +#define AM335X_INT_UART1INT 73 /* UART1 niq */ +#define AM335X_INT_UART2INT 74 /* UART2 niq */ +#define AM335X_INT_RTCINT 75 /* RTC timer_intr_pend */ +#define AM335X_INT_RTCALARMINT 76 /* RTC alarm_intr_pend */ +#define AM335X_INT_MBINT0 77 /* Mailbox0 (mail_u0_irq) initiator_sinterrupt_q_n */ +#define AM335X_INT_M3_TXEV 78 /* Wake M3 Subsystem TXEV */ +#define AM335X_INT_eQEP0INT 79 /* eQEP0 (PWM Subsystem) eqep_intr_intr_pend */ +#define AM335X_INT_MCATXINT0 80 /* McASP0 mcasp_x_intr_pend */ +#define AM335X_INT_MCARXINT0 81 /* McASP0 mcasp_r_intr_pend */ +#define AM335X_INT_MCATXINT1 82 /* McASP1 mcasp_x_intr_pend */ +#define AM335X_INT_MCARXINT1 83 /* McASP1 mcasp_r_intr_pend */ +#define AM335X_INT_ePWM0INT 86 /* (PWM Subsystem) epwm_intr_intr_pend */ +#define AM335X_INT_ePWM1INT 87 /* (PWM Subsystem) epwm_intr_intr_pend */ +#define AM335X_INT_eQEP1INT 88 /* (PWM Subsystem) eqep_intr_intr_pend */ +#define AM335X_INT_eQEP2INT 89 /* (PWM Subsystem) eqep_intr_intr_pend */ +#define AM335X_INT_DMA_INTR_PIN2 90 /* External DMA/Interrupt Pin2 pi_x_dma_event_intr2 (xdma_event_intr2) */ +#define AM335X_INT_WDT1INT 91 /* (Public Watchdog) WDTIMER1 PO_INT_PEND */ +#define AM335X_INT_TINT4 92 /* DMTIMER4 POINTR_PEN */ +#define AM335X_INT_TINT5 93 /* DMTIMER5 POINTR_PEN */ +#define AM335X_INT_TINT6 94 /* DMTIMER6 POINTR_PEND */ +#define AM335X_INT_TINT7 95 /* DMTIMER7 POINTR_PEND */ +#define AM335X_INT_GPIOINT0A 96 /* GPIO 0 POINTRPEND1 */ +#define AM335X_INT_GPIOINT0B 97 /* GPIO 0 POINTRPEND2 */ +#define AM335X_INT_GPIOINT1A 98 /* GPIO 1 POINTRPEND1 */ +#define AM335X_INT_GPIOINT1B 99 /* GPIO 1 POINTRPEND2 */ +#define AM335X_INT_GPMCINT 100 /* GPMC gpmc_sinterrupt */ +#define AM335X_INT_DDRERR0 101 /* EMIF sys_err_intr_pend */ +#define AM335X_INT_TCERRINT0 112 /* TPTC0 tptc_erint_pend_po */ +#define AM335X_INT_TCERRINT1 113 /* TPTC1 tptc_erint_pend_po */ +#define AM335X_INT_TCERRINT2 114 /* TPTC2 tptc_erint_pend_po */ +#define AM335X_INT_ADC_TSC_PENINT 115 /* ADC_TSC pen_intr_pend */ +#define AM335X_INT_SMRFLX_Sabertooth 120 /* Smart Reflex 0 intrpen */ +#define AM335X_INT_SMRFLX_Core 121 /* Smart Reflex 1 intrpend */ +#define AM335X_INT_DMA_INTR_PIN0 123 /* pi_x_dma_event_intr0 (xdma_event_intr0) */ +#define AM335X_INT_DMA_INTR_PIN1 124 /* pi_x_dma_event_intr1 (xdma_event_intr1) */ +#define AM335X_INT_SPI1INT 125 /* McSPI1 SINTERRUPTN */ + +#define OMAP3_AM335X_NR_IRQ_VECTORS 125 +#endif #ifndef __ASSEMBLY__