From aebdb1527d92ba74e2b8d76304e816af7fa7b545 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 10 Mar 2003 17:48:48 -0800 Subject: [PATCH] [PATCH] move common timer and vector code for m68knommu/ColdFire/5249 This patch moves common ColdFire vector and timer procesing code from the local per-processor config.c for the 5249 ColdFire sub-architecture. All ColdFire CPU's have the same timer and basic vector setup, seems crazy to repeat this code for each of 6 ColdFire CPU varients. --- arch/m68knommu/platform/5249/config.c | 180 ++++---------------------- 1 file changed, 22 insertions(+), 158 deletions(-) diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c index 34c3703def69f..046bb1f3d9345 100644 --- a/arch/m68knommu/platform/5249/config.c +++ b/arch/m68knommu/platform/5249/config.c @@ -25,7 +25,11 @@ /***************************************************************************/ -void coldfire_profile_init(void); +void coldfire_tick(void); +void coldfire_timer_init(void (*handler)(int, void *, struct pt_regs *)); +unsigned long coldfire_timer_offset(void); +void coldfire_trap_init(void); +void coldfire_reset(void); /***************************************************************************/ @@ -39,104 +43,7 @@ unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = { MCF_MBAR + MCFDMA_BASE3, }; -unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS]; - -/***************************************************************************/ - -void coldfire_tick(void) -{ - volatile unsigned char *timerp; - - /* Reset the ColdFire timer */ - timerp = (volatile unsigned char *) (MCF_MBAR + MCFTIMER_BASE1); - timerp[MCFTIMER_TER] = MCFTIMER_TER_CAP | MCFTIMER_TER_REF; -} - -/***************************************************************************/ - -void coldfire_timer_init(void (*handler)(int, void *, struct pt_regs *)) -{ - volatile unsigned short *timerp; - volatile unsigned char *icrp; - - /* Set up TIMER 1 as poll clock */ - timerp = (volatile unsigned short *) (MCF_MBAR + MCFTIMER_BASE1); - timerp[MCFTIMER_TMR] = MCFTIMER_TMR_DISABLE; - - timerp[MCFTIMER_TRR] = (unsigned short) ((MCF_CLK / 16) / HZ); - timerp[MCFTIMER_TMR] = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | - MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE; - - icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_TIMER1ICR); - *icrp = MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL5 | MCFSIM_ICR_PRI3; - request_irq(29, handler, SA_INTERRUPT, "ColdFire Timer", NULL); - -#ifdef CONFIG_HIGHPROFILE - coldfire_profile_init(); -#endif - mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_TIMER1); -} - -/***************************************************************************/ -#ifdef CONFIG_HIGHPROFILE -/***************************************************************************/ - -#define PROFILEHZ 1013 - -/* - * Use the other timer to provide high accuracy profiling info. - */ - -void coldfire_profile_tick(int irq, void *dummy, struct pt_regs *regs) -{ - volatile unsigned char *timerp; - - /* Reset the ColdFire timer2 */ - timerp = (volatile unsigned char *) (MCF_MBAR + MCFTIMER_BASE2); - timerp[MCFTIMER_TER] = MCFTIMER_TER_CAP | MCFTIMER_TER_REF; - - if (!user_mode(regs)) { - if (prof_buffer && current->pid) { - extern int _stext; - unsigned long ip = instruction_pointer(regs); - ip -= (unsigned long) &_stext; - ip >>= prof_shift; - if (ip < prof_len) - prof_buffer[ip]++; - } - } -} - -void coldfire_profile_init(void) -{ - volatile unsigned short *timerp; - volatile unsigned char *icrp; - - printk("PROFILE: lodging timer2=%d as profile timer\n", PROFILEHZ); - - /* Set up TIMER 2 as poll clock */ - timerp = (volatile unsigned short *) (MCF_MBAR + MCFTIMER_BASE2); - timerp[MCFTIMER_TMR] = MCFTIMER_TMR_DISABLE; - - timerp[MCFTIMER_TRR] = (unsigned short) ((MCF_CLK / 16) / PROFILEHZ); - timerp[MCFTIMER_TMR] = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | - MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE; - - icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_TIMER2ICR); - - *icrp = MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3; - request_irq(31, coldfire_profile_tick, (SA_INTERRUPT | IRQ_FLG_FAST), - "Profile Timer", NULL); - mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_TIMER2); -} - /***************************************************************************/ -#endif /* CONFIG_HIGHPROFILE */ -/***************************************************************************/ - -/* - * Program the vector to be an auto-vectored. - */ void mcf_autovector(unsigned int vec) { @@ -152,78 +59,35 @@ void mcf_autovector(unsigned int vec) /***************************************************************************/ -extern e_vector *_ramvec; - -void set_evector(int vecnum, void (*handler)(void)) +void mcf_settimericr(unsigned int timer, unsigned int level) { - if (vecnum >= 0 && vecnum <= 255) - _ramvec[vecnum] = handler; -} - -/***************************************************************************/ - -/* assembler routines */ -asmlinkage void buserr(void); -asmlinkage void trap(void); -asmlinkage void system_call(void); -asmlinkage void inthandler(void); - -void __init coldfire_trap_init(void) -{ - int i; - -#ifndef ENABLE_dBUG - mcf_setimr(MCFSIM_IMR_MASKALL); -#endif - - /* - * There is a common trap handler and common interrupt - * handler that handle almost every vector. We treat - * the system call and bus error special, they get their - * own first level handlers. - */ -#ifndef ENABLE_dBUG - for (i = 3; (i <= 23); i++) - _ramvec[i] = trap; - for (i = 33; (i <= 63); i++) - _ramvec[i] = trap; -#endif - - for (i = 24; (i <= 30); i++) - _ramvec[i] = inthandler; -#ifndef ENABLE_dBUG - _ramvec[31] = inthandler; // Disables the IRQ7 button -#endif - - for (i = 64; (i < 255); i++) - _ramvec[i] = inthandler; - _ramvec[255] = 0; - - _ramvec[2] = buserr; - _ramvec[32] = system_call; + volatile unsigned char *icrp; + unsigned int icr, imr; + + if (timer <= 2) { + switch (timer) { + case 2: icr = MCFSIM_TIMER2ICR; imr = MCFSIM_IMR_TIMER2; break; + default: icr = MCFSIM_TIMER1ICR; imr = MCFSIM_IMR_TIMER1; break; + } + + icrp = (volatile unsigned char *) (MCF_MBAR + icr); + *icrp = MCFSIM_ICR_AUTOVEC | (level << 2) | MCFSIM_ICR_PRI3; + mcf_setimr(mcf_getimr() & ~imr); + } } /***************************************************************************/ void config_BSP(char *commandp, int size) { + mcf_setimr(MCFSIM_IMR_MASKALL); memset(commandp, 0, size); mach_sched_init = coldfire_timer_init; mach_tick = coldfire_tick; + mach_gettimeoffset = coldfire_timer_offset; mach_trap_init = coldfire_trap_init; + mach_reset = coldfire_reset; } /***************************************************************************/ -#ifdef TRAP_DBG_INTERRUPT - -asmlinkage void dbginterrupt_c(struct frame *fp) -{ - extern void dump(struct pt_regs *fp); - printk("%s(%d): BUS ERROR TRAP\n", __FILE__, __LINE__); - dump((struct pt_regs *) fp); - asm("halt"); -} - -#endif -/***************************************************************************/ -- 2.53.0