Add _CPU_Counter_frequency()

Add rtems_counter_frequency() API function.  Use it to initialize the
counter value converter via the new system initialization step
(RTEMS_SYSINIT_CPU_COUNTER).  This decouples the counter implementation
and the counter converter.  It avoids an unnecessary pull in of the
64-bit integer division from libgcc.

Update #3456.

2 files changed, 23 insertions, 14 deletions

diff --git a/bsps/sparc/erc32/clock/ckinit.c b/bsps/sparc/erc32/clock/ckinit.c
index 7f8c0f5aad..e54061abac 100644
--- a/bsps/sparc/erc32/clock/ckinit.c
+++ b/bsps/sparc/erc32/clock/ckinit.c
@@ -28,6 +28,8 @@
 #include <rtems/timecounter.h>
 #include <rtems/score/sparcimpl.h>
 
+#define ERC32_REAL_TIME_CLOCK_FREQUENCY 1000000
+
 /*
  *  The Real Time Clock Counter Timer uses this trap type.
  */
@@ -78,19 +80,22 @@ static void erc32_tc_tick( void )
   );
 }
 
-static void erc32_counter_initialize( uint32_t frequency )
+static void erc32_counter_initialize( void )
 {
   _SPARC_Counter_initialize(
     _SPARC_Counter_read_address,
     _SPARC_Counter_difference_clock_period,
     &ERC32_MEC.Real_Time_Clock_Counter
   );
-  rtems_counter_initialize_converter( frequency );
+}
+
+uint32_t _CPU_Counter_frequency(void)
+{
+  return ERC32_REAL_TIME_CLOCK_FREQUENCY;
 }
 
 #define Clock_driver_support_initialize_hardware() \
   do { \
-    uint32_t frequency = 1000000; \
     /* approximately 1 us per countdown */ \
     ERC32_MEC.Real_Time_Clock_Scalar  = CLOCK_SPEED - 1; \
     ERC32_MEC.Real_Time_Clock_Counter = \
@@ -108,11 +113,11 @@ static void erc32_counter_initialize( uint32_t frequency )
     );  \
     rtems_timecounter_simple_install( \
         &erc32_tc, \
-        frequency, \
+        ERC32_REAL_TIME_CLOCK_FREQUENCY, \
         rtems_configuration_get_microseconds_per_tick(), \
         erc32_tc_get_timecount \
     ); \
-    erc32_counter_initialize( frequency ); \
+    erc32_counter_initialize(); \
   } while (0)
 
 #define Clock_driver_timecounter_tick() erc32_tc_tick()
diff --git a/bsps/sparc/leon3/start/cpucounter.c b/bsps/sparc/leon3/start/cpucounter.c
index 87554ce550..2df1409209 100644
--- a/bsps/sparc/leon3/start/cpucounter.c
+++ b/bsps/sparc/leon3/start/cpucounter.c
@@ -18,11 +18,17 @@
 #include <rtems/sysinit.h>
 #include <rtems/score/sparcimpl.h>
 
+static uint32_t leon3_counter_frequency = 1000000000;
+
+uint32_t _CPU_Counter_frequency(void)
+{
+  return leon3_up_counter_frequency;
+}
+
 static void leon3_counter_initialize(void)
 {
   volatile struct irqmp_timestamp_regs *irqmp_ts;
   volatile struct gptimer_regs *gpt;
-  unsigned int freq;
 
   irqmp_ts = &LEON3_IrqCtrl_Regs->timestamp[0];
   gpt = LEON3_Timer_Regs;
@@ -38,8 +44,7 @@ static void leon3_counter_initialize(void)
       NULL
     );
 
-    freq = leon3_up_counter_frequency();
-    rtems_counter_initialize_converter(freq);
+    leon3_counter_frequency = leon3_up_counter_frequency();
   } else if (leon3_irqmp_has_timestamp(irqmp_ts)) {
     /* Use the interrupt controller timestamp counter if available */
 
@@ -52,8 +57,7 @@ static void leon3_counter_initialize(void)
       (volatile const uint32_t *) &irqmp_ts->counter
     );
 
-    freq = ambapp_freq_get(&ambapp_plb, LEON3_IrqCtrl_Adev);
-    rtems_counter_initialize_converter(freq);
+    leon3_counter_frequency = ambapp_freq_get(&ambapp_plb, LEON3_IrqCtrl_Adev);
   } else if (gpt != NULL) {
     /* Fall back to the first GPTIMER if available */
 
@@ -66,15 +70,15 @@ static void leon3_counter_initialize(void)
       (volatile const uint32_t *) &gpt->timer[LEON3_CLOCK_INDEX].value
     );
 
-    freq = ambapp_freq_get(&ambapp_plb, LEON3_Timer_Adev);
-    rtems_counter_initialize_converter(freq / (gpt->scaler_reload - 1));
+    leon3_counter_frequency = ambapp_freq_get(&ambapp_plb, LEON3_Timer_Adev) /
+      (gpt->scaler_reload - 1);
   }
 }
 
 RTEMS_SYSINIT_ITEM(
   leon3_counter_initialize,
-  RTEMS_SYSINIT_BSP_START,
-  RTEMS_SYSINIT_ORDER_THIRD
+  RTEMS_SYSINIT_CPU_COUNTER,
+  RTEMS_SYSINIT_ORDER_FIRST
 );
 
 SPARC_COUNTER_DEFINITION;