Changeset b61d5cac in rtems

Timestamp:

06/14/16 08:56:09 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

ea02782a

Parents:

042072b

git-author:

Sebastian Huber <sebastian.huber@…> (06/14/16 08:56:09)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/14/16 09:57:48)

Message:

bsps: Add CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR

Add CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR clock driver option. If
defined, then do the clock tick processing on the boot processor on
behalf of all other processors. Currently, this is intended as a
workaround for a Qemu shortcoming on ARM.

Update #2737.

Location:

c/src/lib/libbsp

Files:

• arm/realview-pbx-a9/configure.ac (modified) (1 diff)
• arm/shared/arm-a9mpcore-clock-config.c (modified) (2 diffs)
• shared/clockdrv_shell.h (modified) (2 diffs)

c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac

@@ -42 +42 @@
 simulation times.])
 
+RTEMS_BSPOPTS_SET([CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR],[*qemu*],[1])
+RTEMS_BSPOPTS_HELP([CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR],
+[If defined, then do the clock tick processing on the boot processor on behalf
+of all other processors.])
+
 RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])

c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c

@@ -95 +95 @@
 }
 
-#ifdef RTEMS_SMP
+#if defined(RTEMS_SMP) && !defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR)
 typedef struct {
   uint64_t cmpval;
@@ -117 +117 @@
 )
 {
-#ifdef RTEMS_SMP
+#if defined(RTEMS_SMP) && !defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR)
   a9mpcore_clock_init_data init_data = {
     .cmpval = cmpval,

c/src/lib/libbsp/shared/clockdrv_shell.h

@@ -22 +22 @@
 #include <rtems/score/percpu.h>
 #include <rtems/score/smpimpl.h>
+#include <rtems/score/watchdogimpl.h>
 
 #ifdef Clock_driver_nanoseconds_since_last_tick
@@ -65 +66 @@
  */
 #ifndef Clock_driver_timecounter_tick
-  #ifdef CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
-    #define Clock_driver_timecounter_tick() rtems_clock_tick()
-  #else
-    #define Clock_driver_timecounter_tick() rtems_timecounter_tick()
-  #endif
+static void Clock_driver_timecounter_tick( void )
+{
+#if defined(CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER)
+  rtems_clock_tick();
+#elif defined(RTEMS_SMP) && defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR)
+  uint32_t cpu_count = _SMP_Get_processor_count();
+  uint32_t cpu_index;
+
+  for ( cpu_index = 0 ; cpu_index < cpu_count ; ++cpu_index ) {
+    Per_CPU_Control *cpu;
+
+    cpu = _Per_CPU_Get_by_index( cpu_index );
+
+    if ( _Per_CPU_Is_boot_processor( cpu ) ) {
+      rtems_timecounter_tick();
+    } else if ( _Processor_mask_Is_set( _SMP_Online_processors, cpu_index ) ) {
+      _Watchdog_Tick( cpu );
+    }
+  }
+#else
+  rtems_timecounter_tick();
+#endif
+}
 #endif