Changeset 5a0b27ed in rtems for c

Timestamp:

Mar 15, 2016, 1:29:15 PM (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

78c9fe8

Parents:

057154e

git-author:

Sebastian Huber <sebastian.huber@…> (03/15/16 13:29:15)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/15/16 13:32:16)

Message:

bsp/leon3: Clock driver workaround for GR712RC

File:

• c/src/lib/libbsp/sparc/leon3/clock/ckinit.c (modified) (9 diffs)

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

@@ -42 +42 @@
 static int clkirq;
 
-static bool leon3_tc_use_irqmp;
+static void (*leon3_tc_tick)(void);
 
 static rtems_timecounter_simple leon3_tc;
 
+#ifndef RTEMS_SMP
 static uint32_t leon3_tc_get(rtems_timecounter_simple *tc)
 {
@@ -54 +55 @@
 {
   return LEON_Is_interrupt_pending(clkirq);
+}
+
+static void leon3_tc_at_tick( rtems_timecounter_simple *tc )
+{
+  /* Nothing to do */
 }
 
@@ -65 +71 @@
 }
 
+static void leon3_tc_tick_simple(void)
+{
+  rtems_timecounter_simple_downcounter_tick(
+    &leon3_tc,
+    leon3_tc_get,
+    leon3_tc_at_tick
+  );
+}
+#endif
+
 static uint32_t leon3_tc_get_timecount_irqmp(struct timecounter *tc)
 {
@@ -70 +86 @@
 }
 
-static void leon3_clock_profiling_interrupt_delay(void)
+#ifdef RTEMS_SMP
+static uint32_t leon3_tc_get_timecount_second_timer(struct timecounter *tc)
+{
+  return 0xffffffff - LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX + 1].value;
+}
+#endif
+
+static void leon3_tc_tick_irqmp_timestamp(void)
 {
 #ifdef RTEMS_PROFILING
@@ -91 +114 @@
 
     _Profiling_Update_max_interrupt_delay(_Per_CPU_Get(), second - first);
-  } else if (state == 1 && leon3_irqmp_has_timestamp(irqmp_ts)) {
+  } else if (state == 1) {
     unsigned int ks = 1U << 5;
 
@@ -101 +124 @@
   }
 #endif
-}
-
-static void leon3_tc_at_tick( rtems_timecounter_simple *tc )
-{
-  leon3_clock_profiling_interrupt_delay();
-}
-
-static void leon3_tc_tick(void)
-{
-  if (leon3_tc_use_irqmp) {
-    leon3_clock_profiling_interrupt_delay();
-    rtems_timecounter_tick();
-  } else {
-    rtems_timecounter_simple_downcounter_tick(
-      &leon3_tc,
-      leon3_tc_get,
-      leon3_tc_at_tick
-    );
-  }
+
+  rtems_timecounter_tick();
+}
+
+#ifdef RTEMS_SMP
+static void leon3_tc_tick_second_timer(void)
+{
+  rtems_timecounter_tick();
+}
+#endif
+
+static void leon3_tc_do_tick(void)
+{
+  (*leon3_tc_tick)();
 }
 
@@ -184 +202 @@
     leon3_tc.tc.tc_frequency = ambapp_freq_get(&ambapp_plb, LEON3_Timer_Adev);
     leon3_tc.tc.tc_quality = RTEMS_TIMECOUNTER_QUALITY_CLOCK_DRIVER;
-    leon3_tc_use_irqmp = true;
+    leon3_tc_tick = leon3_tc_tick_irqmp_timestamp;
     rtems_timecounter_install(&leon3_tc.tc);
   } else {
+#ifdef RTEMS_SMP
+    /*
+     * The GR712RC for example has no timestamp unit in the interrupt
+     * controller.  At least on SMP configurations we must use a second timer
+     * in free running mode for the timecounter.
+     */
+    LEON3_Timer_Regs->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;
+    leon3_tc.tc.tc_counter_mask = 0xffffffff;
+    leon3_tc.tc.tc_frequency = LEON3_GPTIMER_0_FREQUENCY_SET_BY_BOOT_LOADER;
+    leon3_tc.tc.tc_quality = RTEMS_TIMECOUNTER_QUALITY_CLOCK_DRIVER;
+    leon3_tc_tick = leon3_tc_tick_second_timer;
+    rtems_timecounter_install(&leon3_tc.tc);
+#else
+    leon3_tc_tick = leon3_tc_tick_simple;
     rtems_timecounter_simple_install(
       &leon3_tc,
@@ -193 +227 @@
       leon3_tc_get_timecount
     );
+#endif
   }
 }
@@ -205 +240 @@
   } while (0)
 
-#define Clock_driver_timecounter_tick() leon3_tc_tick()
+#define Clock_driver_timecounter_tick() leon3_tc_do_tick()
 
 #include "../../../shared/clockdrv_shell.h"