sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/src/am335x/am335x_timerisr.c: Switch to DMTimer2 for system tick generation. U-Boot does not enable DMTimer1ms clocks hence it is not possible to use it until implementation in am335x_clockconfig.c is ready

Browse Source
This commit is contained in:
Petro Karashchenko 2019-01-16 15:09:40 -06:00 committed by Gregory Nutt
parent 4e98eb7581
commit 0f324d3bce
2 changed files with 76 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
arch/arm/src/am335x/am335x_timerisr.c
View File

@ -55,9 +55,16 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Timer 1 clock selects the external 32.768 KHz oscillator/clock */ #ifdef USE_TIMER1MS
/* Timer 1 clock selects the external 32.768 KHz oscillator/clock */
#define TMR_CLOCK (32768) # define TMR_CLOCK (32768)
#else
/* Timer clock selects system clock CLK_M_OSC (24MHz) */
# define TMR_CLOCK (24000000ll)
#endif
/* The desired timer interrupt frequency is provided by the definition /* The desired timer interrupt frequency is provided by the definition
* CLK_TCK (see include/time.h). CLK_TCK defines the desired number of * CLK_TCK (see include/time.h). CLK_TCK defines the desired number of
@ -70,10 +77,22 @@
#define TMR_TLDR (0xffffffff - (TMR_CLOCK / CLK_TCK) + 1) #define TMR_TLDR (0xffffffff - (TMR_CLOCK / CLK_TCK) + 1)
#define TMR_TCRR (0xffffffff - (TMR_CLOCK / CLK_TCK) + 1) #define TMR_TCRR (0xffffffff - (TMR_CLOCK / CLK_TCK) + 1)
#define TMR_TPIR \
(((TMR_CLOCK / CLK_TCK + 1) * 1000000l) - (TMR_CLOCK * (1000000l / CLK_TCK))) #ifdef USE_TIMER1MS
#define TMR_TNIR \ # define TMR_TPIR \
(((TMR_CLOCK / CLK_TCK) * 1000000l) - (TMR_CLOCK * (1000000l / CLK_TCK))) (((TMR_CLOCK / CLK_TCK + 1) * 1000000l) - \
(TMR_CLOCK * (1000000l / CLK_TCK)))
# define TMR_TNIR \
(((TMR_CLOCK / CLK_TCK) * 1000000l) - \
(TMR_CLOCK * (1000000l / CLK_TCK)))
#else
# define TMR_TPIR \
(((TMR_CLOCK / CLK_TCK + 1) * 1000000ll) - \
(TMR_CLOCK * (1000000ll / CLK_TCK)))
# define TMR_TNIR \
(((TMR_CLOCK / CLK_TCK) * 1000000ll) - \
(TMR_CLOCK * (1000000ll / CLK_TCK)))
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -92,7 +111,11 @@ static int am335x_timerisr(int irq, uint32_t *regs, void *arg)
{ {
/* Clear the pending interrupt by writing a '1' to the status register */ /* Clear the pending interrupt by writing a '1' to the status register */
putreg32(getreg32(AM335X_TMR1MS_TISR), AM335X_TMR1MS_TISR); #ifdef USE_TIMER1MS
putreg32(TMR1MS_IRQ_FLAG_OVF, AM335X_TMR1MS_TISR);
#else
putreg32(TMR_IRQ_FLAG_OVF, AM335X_TMR2_IRQ_STAT);
#endif
/* Process timer interrupt */ /* Process timer interrupt */
@ -118,11 +141,11 @@ void arm_timer_initialize(void)
{ {
uint32_t regval; uint32_t regval;
#ifdef USE_TIMER1MS
/* Make sure that interrupts from the Timer 1 are disabled */ /* Make sure that interrupts from the Timer 1 are disabled */
up_disable_irq(AM335X_IRQ_TIMER1_1MS); up_disable_irq(AM335X_IRQ_TIMER1_1MS);
#if 0
/* Soft reset the timer */ /* Soft reset the timer */
putreg32(TMR1MS_TIOCP_SOFT_RESET, AM335X_TMR1MS_TIOCP_CFG); putreg32(TMR1MS_TIOCP_SOFT_RESET, AM335X_TMR1MS_TIOCP_CFG);
@ -130,21 +153,15 @@ void arm_timer_initialize(void)
while (!(getreg32(AM335X_TMR1MS_TISTAT) & TMR1MS_TISTAT)) while (!(getreg32(AM335X_TMR1MS_TISTAT) & TMR1MS_TISTAT))
{ {
} }
#endif
/* Stop timer */
putreg32(0, AM335X_TMR1MS_TCLR);
putreg32(TMR_TPIR, AM335X_TMR1MS_TPIR); putreg32(TMR_TPIR, AM335X_TMR1MS_TPIR);
putreg32(TMR_TNIR, AM335X_TMR1MS_TNIR); putreg32(TMR_TNIR, AM335X_TMR1MS_TNIR);
putreg32(TMR_TLDR, AM335X_TMR1MS_TLDR); putreg32(TMR_TLDR, AM335X_TMR1MS_TLDR);
putreg32(TMR_TCRR, AM335X_TMR1MS_TCRR); putreg32(TMR_TCRR, AM335X_TMR1MS_TCRR);
/* Setup auto-reload, trigger on overflow and start timer */ /* Setup auto-reload and start timer */
regval = TMR1MS_TCLR_TRG_OFLOW | TMR1MS_TCLR_AR | regval = TMR1MS_TCLR_AR | TMR1MS_TCLR_ST;
TMR1MS_TCLR_ST;
putreg32(regval, AM335X_TMR1MS_TCLR); putreg32(regval, AM335X_TMR1MS_TCLR);
/* Attach the timer interrupt vector */ /* Attach the timer interrupt vector */
@ -164,4 +181,39 @@ void arm_timer_initialize(void)
/* And enable the timer interrupt */ /* And enable the timer interrupt */
up_enable_irq(AM335X_IRQ_TIMER1_1MS); up_enable_irq(AM335X_IRQ_TIMER1_1MS);
#else
/* Make sure that interrupts from the Timer 2 are disabled */
up_disable_irq(AM335X_IRQ_TIMER2);
/* Soft reset the timer */
putreg32(TMR_TIOCP_SOFT_RESET, AM335X_TMR2_TIOCP_CFG);
while ((getreg32(AM335X_TMR2_TIOCP_CFG) & TMR_TIOCP_SOFT_RESET))
{
}
putreg32(TMR_TLDR, AM335X_TMR2_TLDR);
putreg32(TMR_TCRR, AM335X_TMR2_TCRR);
/* Setup auto-reload and start timer */
regval = TMR_TCLR_AR | TMR_TCLR_ST;
putreg32(regval, AM335X_TMR2_TCLR);
/* Attach the timer interrupt vector */
(void)irq_attach(AM335X_IRQ_TIMER2, (xcpt_t)am335x_timerisr, NULL);
/* Enable overflow interrupt */
putreg32(TMR_IRQ_FLAG_OVF, AM335X_TMR2_IRQ_EN_SET);
/* And enable the timer interrupt */
up_enable_irq(AM335X_IRQ_TIMER2);
#endif
} }

8
arch/arm/src/am335x/chip/am335x_timer.h
View File

@ -100,6 +100,14 @@
#define AM335X_TMR1MS_TPIR (AM335X_DMTIMER1_1MS_VADDR + AM335X_TMR1MS_TPIR_OFFSET) #define AM335X_TMR1MS_TPIR (AM335X_DMTIMER1_1MS_VADDR + AM335X_TMR1MS_TPIR_OFFSET)
#define AM335X_TMR1MS_TNIR (AM335X_DMTIMER1_1MS_VADDR + AM335X_TMR1MS_TNIR_OFFSET) #define AM335X_TMR1MS_TNIR (AM335X_DMTIMER1_1MS_VADDR + AM335X_TMR1MS_TNIR_OFFSET)
#define AM335X_TMR2_TIOCP_CFG (AM335X_DMTIMER2_VADDR + AM335X_TMR_TIOCP_CFG_OFFSET)
#define AM335X_TMR2_IRQ_STAT (AM335X_DMTIMER2_VADDR + AM335X_TMR_IRQ_STAT_OFFSET)
#define AM335X_TMR2_IRQ_EN_SET (AM335X_DMTIMER2_VADDR + AM335X_TMR_IRQ_EN_SET_OFFSET)
#define AM335X_TMR2_IRQ_EN_CLR (AM335X_DMTIMER2_VADDR + AM335X_TMR_IRQ_EN_CLR_OFFSET)
#define AM335X_TMR2_TCLR (AM335X_DMTIMER2_VADDR + AM335X_TMR_TCLR_OFFSET)
#define AM335X_TMR2_TCRR (AM335X_DMTIMER2_VADDR + AM335X_TMR_TCRR_OFFSET)
#define AM335X_TMR2_TLDR (AM335X_DMTIMER2_VADDR + AM335X_TMR_TLDR_OFFSET)
/* Register bit field definitions ***************************************************/ /* Register bit field definitions ***************************************************/
#define TMR_TIOCP_SOFT_RESET (1 << 0) /* Bit 0: Software reset */ #define TMR_TIOCP_SOFT_RESET (1 << 0) /* Bit 0: Software reset */