diff options
| author | Daniel Cederman <cederman@gaisler.com> | 2014-08-21 09:49:42 +0200 |
|---|---|---|
| committer | Daniel Hellstrom <daniel@gaisler.com> | 2014-09-10 13:48:12 +0200 |
| commit | 30ea723c26e417d8a6dc6fef9f684e35e7156da9 (patch) | |
| tree | 0d116f84280dbb1ffac2b9649a2aad36178212a0 | |
| parent | e7551d7f1ec35cd52acb93394c4b9ba017f95ec0 (diff) | |
LEON3: Clear timer pending bit together with tick update in critical section
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/clock/ckinit.c | 14 | ||||
| -rw-r--r-- | cpukit/score/src/coretodtickle.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c index f382f1abc6..e267541093 100644 --- a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c @@ -35,6 +35,7 @@ volatile struct gptimer_regs *LEON3_Timer_Regs = 0; static int clkirq; +static unsigned char irq_ack_mask; static void leon3_clock_profiling_interrupt_delay(void) { @@ -126,6 +127,11 @@ static void bsp_clock_handler_install(rtems_isr *new) #define Clock_driver_support_initialize_hardware() \ do { \ + LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl = GPTIMER_TIMER_CTRL_IP; \ + if ((LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl & GPTIMER_TIMER_CTRL_IP) != 0) \ + irq_ack_mask = ~GPTIMER_TIMER_CTRL_IP; \ + else \ + irq_ack_mask = ~0; \ LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].reload = \ rtems_configuration_get_microseconds_per_tick() - 1; \ \ @@ -140,6 +146,12 @@ static void bsp_clock_handler_install(rtems_isr *new) LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl = 0; \ } while (0) +leon3_clear_timer_interrupt_pending_bit(void) +{ + unsigned int ctrl = LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl; + LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl = ctrl & irq_ack_mask; +} + static uint32_t bsp_clock_nanoseconds_since_last_tick(void) { uint32_t clicks; @@ -150,7 +162,7 @@ static uint32_t bsp_clock_nanoseconds_since_last_tick(void) clicks = LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].value; - if ( LEON_Is_interrupt_pending( clkirq ) ) { + if( LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl & GPTIMER_TIMER_CTRL_IP ) { clicks = LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].value; usecs = (2*rtems_configuration_get_microseconds_per_tick() - clicks); } else { diff --git a/cpukit/score/src/coretodtickle.c b/cpukit/score/src/coretodtickle.c index 2bc610529d..8d2eacf5aa 100644 --- a/cpukit/score/src/coretodtickle.c +++ b/cpukit/score/src/coretodtickle.c @@ -39,6 +39,8 @@ void _TOD_Tickle_ticks( void ) _TOD_Acquire( tod, &lock_context ); + leon3_clear_timer_interrupt_pending_bit(); + /* Update the uptime */ _Timestamp_Add_to( &tod->uptime, &tick ); |