Changeset a4ff2a2 in rtems

Timestamp:

06/21/16 08:24:13 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

bc884f6

Parents:

291945f1

git-author:

Sebastian Huber <sebastian.huber@…> (06/21/16 08:24:13)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/21/16 13:54:18)

Message:

bsp/leon3: Add up counter timecounter

Location:

c/src/lib/libbsp

Files:

• shared/include/fatal.h (modified) (2 diffs)
• sparc/leon3/clock/ckinit.c (modified) (4 diffs)

c/src/lib/libbsp/shared/include/fatal.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012-2015 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2012, 2016 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -56 +56 @@
   LEON3_FATAL_INVALID_CACHE_CONFIG_MAIN_PROCESSOR,
   LEON3_FATAL_INVALID_CACHE_CONFIG_SECONDARY_PROCESSOR,
+  LEON3_FATAL_CLOCK_NO_IRQMP_TIMESTAMP_SUPPORT,
 
   /* LPC24XX fatal codes */

c/src/lib/libbsp/sparc/leon3/clock/ckinit.c

@@ -13 +13 @@
  *  COPYRIGHT (c) 2004.
  *  Gaisler Research.
+ *
+ *  Copyright (c) 2014, 2016 embedded brains GmbH
  *
  *  The license and distribution terms for this file may be
@@ -80 +82 @@
 }
 #endif
+
+static uint32_t leon3_tc_get_timecount_up_counter(struct timecounter *tc)
+{
+  return leon3_up_counter_low();
+}
 
 static uint32_t leon3_tc_get_timecount_irqmp(struct timecounter *tc)
@@ -203 +210 @@
 static void leon3_clock_initialize(void)
 {
-  volatile struct irqmp_timestamp_regs *irqmp_ts =
-    &LEON3_IrqCtrl_Regs->timestamp[0];
-
-  LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].reload =
+  volatile struct irqmp_timestamp_regs *irqmp_ts;
+  volatile struct gptimer_regs *gpt;
+
+  irqmp_ts = &LEON3_IrqCtrl_Regs->timestamp[0];
+  gpt = LEON3_Timer_Regs;
+
+  gpt->timer[LEON3_CLOCK_INDEX].reload =
     rtems_configuration_get_microseconds_per_tick() - 1;
-  LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl =
+  gpt->timer[LEON3_CLOCK_INDEX].ctrl =
     GPTIMER_TIMER_CTRL_EN | GPTIMER_TIMER_CTRL_RS |
       GPTIMER_TIMER_CTRL_LD | GPTIMER_TIMER_CTRL_IE;
 
-  if (leon3_irqmp_has_timestamp(irqmp_ts)) {
+  leon3_up_counter_enable();
+
+  if (leon3_up_counter_is_available()) {
+    /* Use the LEON4 up-counter if available */
+    leon3_tc.tc.tc_get_timecount = leon3_tc_get_timecount_up_counter;
+    leon3_tc.tc.tc_counter_mask = 0xffffffff;
+    leon3_tc.tc.tc_frequency = leon3_up_counter_frequency();
+    leon3_tc.tc.tc_quality = RTEMS_TIMECOUNTER_QUALITY_CLOCK_DRIVER;
+
+#ifdef RTEMS_PROFILING
+    if (!leon3_irqmp_has_timestamp(irqmp_ts)) {
+      bsp_fatal(LEON3_FATAL_CLOCK_NO_IRQMP_TIMESTAMP_SUPPORT);
+    }
+#endif
+
+    leon3_tc_tick = leon3_tc_tick_irqmp_timestamp_init;
+    rtems_timecounter_install(&leon3_tc.tc);
+  } else if (leon3_irqmp_has_timestamp(irqmp_ts)) {
+    /* Use the interrupt controller timestamp counter if available */
     leon3_tc.tc.tc_get_timecount = leon3_tc_get_timecount_irqmp;
     leon3_tc.tc.tc_counter_mask = 0xffffffff;
@@ -226 +254 @@
      * in free running mode for the timecounter.
      */
-    LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX + 1].ctrl =
+    gpt->timer[LEON3_CLOCK_INDEX + 1].ctrl =
       GPTIMER_TIMER_CTRL_EN | GPTIMER_TIMER_CTRL_IE;
     leon3_tc.tc.tc_get_timecount = leon3_tc_get_timecount_second_timer;