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.
2018-05-23 14:17:25 +02:00
parent 4c7b18e358
commit 65f868cac6
80 changed files with 293 additions and 86 deletions
--- a/cpukit/include/rtems/counter.h
+++ b/cpukit/include/rtems/counter.h
@@ -7,7 +7,7 @@
 */

 /*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2014, 2018 embedded brains GmbH.  All rights reserved.
 *
 *  embedded brains GmbH
 *  Dornierstr. 4
@@ -61,6 +61,16 @@ extern "C" {
 */
 typedef CPU_Counter_ticks rtems_counter_ticks;

+/**
+ * @brief Returns the current counter frequency in Hz.
+ *
+ * @return The current counter frequency in Hz.
+ */
+static inline uint32_t rtems_counter_frequency( void )
+{
+  return _CPU_Counter_frequency();
+}
+
 /**
 * @brief Reads the current counter values.
 *
--- a/cpukit/sapi/src/cpucounterconverter.c
+++ b/cpukit/sapi/src/cpucounterconverter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2014, 2018 embedded brains GmbH.  All rights reserved.
 *
 *  embedded brains GmbH
 *  Dornierstr. 4
@@ -13,12 +13,13 @@
 */

 #include <rtems/counter.h>
+#include <rtems/sysinit.h>

 RTEMS_STATIC_ASSERT(sizeof(rtems_counter_ticks) <= sizeof(uint32_t), type);

-static uint64_t to_ns_scaler = UINT64_C(1) << 32;
+static uint64_t to_ns_scaler;

-static uint64_t from_ns_scaler = UINT64_C(1) << 32;
+static uint64_t from_ns_scaler;

 uint64_t rtems_counter_ticks_to_nanoseconds( rtems_counter_ticks counter )
 {
@@ -37,3 +38,14 @@ void rtems_counter_initialize_converter( uint32_t frequency )
  to_ns_scaler = ((ns_per_s << 32) + frequency - 1) / frequency;
  from_ns_scaler = ((UINT64_C(1) << 32) * frequency + ns_per_s - 1) / ns_per_s;
 }
+
+static void rtems_counter_sysinit( void )
+{
+  rtems_counter_initialize_converter( rtems_counter_frequency() );
+}
+
+RTEMS_SYSINIT_ITEM(
+  rtems_counter_sysinit,
+  RTEMS_SYSINIT_CPU_COUNTER,
+  RTEMS_SYSINIT_ORDER_LAST
+);
--- a/cpukit/score/cpu/arm/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
@@ -596,6 +596,8 @@ static inline uint16_t CPU_swap_u16( uint16_t value )

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/bfin/Makefile.am
+++ b/cpukit/score/cpu/bfin/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += bfin-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
--- a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
@@ -982,6 +982,8 @@ static inline uint32_t CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/epiphany/Makefile.am
+++ b/cpukit/score/cpu/epiphany/Makefile.am
@@ -8,6 +8,7 @@ libscorecpu_a_SOURCES  = cpu.c
 libscorecpu_a_SOURCES += epiphany-exception-handler.S
 libscorecpu_a_SOURCES += epiphany-context-switch.S
 libscorecpu_a_SOURCES += epiphany-context-initialize.c
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += setjmp.S

 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
--- a/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
@@ -854,6 +854,8 @@ static inline void _CPU_Context_validate( uintptr_t pattern )

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)

--- a/cpukit/score/cpu/i386/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
@@ -697,6 +697,8 @@ void _CPU_Exception_frame_print( const CPU_Exception_frame *frame );

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/lm32/Makefile.am
+++ b/cpukit/score/cpu/lm32/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S irq.c
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += lm32-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
--- a/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
@@ -1018,6 +1018,8 @@ static inline uint16_t CPU_swap_u16(uint16_t v)

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/m32c/Makefile.am
+++ b/cpukit/score/cpu/m32c/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/automake/compile.am
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.c context_switch.S context_init.c \
    varvects.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += m32c-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
--- a/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
@@ -968,6 +968,8 @@ static inline uint32_t CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -4,6 +4,7 @@ noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)

 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += m68k-exception-frame-print.c
 libscorecpu_a_SOURCES += __m68k_read_tp.c
--- a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
@@ -679,6 +679,8 @@ void _CPU_Exception_frame_print(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)

--- a/cpukit/score/cpu/mips/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/cpu.h
@@ -988,6 +988,8 @@ static inline uint32_t CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/moxie/Makefile.am
+++ b/cpukit/score/cpu/moxie/Makefile.am
@@ -6,6 +6,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c moxie-exception-frame-print.c cpu_asm.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)

--- a/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
@@ -835,6 +835,8 @@ static inline uint32_t   CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/nios2/Makefile.am
+++ b/cpukit/score/cpu/nios2/Makefile.am
@@ -5,6 +5,7 @@ CLEANFILES =
 noinst_LIBRARIES = libscorecpu.a

 libscorecpu_a_SOURCES =
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += nios2-context-initialize.c
 libscorecpu_a_SOURCES += nios2-context-switch.S
--- a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
@@ -353,6 +353,8 @@ static inline uint32_t CPU_swap_u32( uint32_t value )

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.c
+libscorecpu_a_SOURCES += cpucounterfrequency.c
 libscorecpu_a_SOURCES += cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)

--- a/cpukit/score/cpu/no_cpu/cpucounterfrequency.c
+++ b/cpukit/score/cpu/no_cpu/cpucounterfrequency.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#include <rtems/score/cpu.h>
+
+uint32_t _CPU_Counter_frequency( void )
+{
+  return 1000000000;
+}
--- a/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
@@ -1328,6 +1328,13 @@ static inline uint32_t CPU_swap_u32(
 */
 typedef uint32_t CPU_Counter_ticks;

+/**
+ * @brief Returns the current CPU counter frequency in Hz.
+ *
+ * @return The current CPU counter frequency in Hz.
+ */
+uint32_t _CPU_Counter_frequency( void );
+
 /**
 * @brief Returns the current CPU counter value.
 *
--- a/cpukit/score/cpu/or1k/Makefile.am
+++ b/cpukit/score/cpu/or1k/Makefile.am
@@ -6,8 +6,9 @@ noinst_LIBRARIES = libscorecpu.a

 libscorecpu_a_SOURCES =
 libscorecpu_a_SOURCES += cpu.c
-libscorecpu_a_SOURCES += or1k-context-switch.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += or1k-context-initialize.c
+libscorecpu_a_SOURCES += or1k-context-switch.S
 libscorecpu_a_SOURCES += or1k-context-validate.S
 libscorecpu_a_SOURCES += or1k-context-volatile-clobber.S
 libscorecpu_a_SOURCES += or1k-exception-default.c
--- a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
@@ -665,8 +665,6 @@ void _CPU_Context_Initialize(
 #define CPU_MAXIMUM_PROCESSORS 32

 #ifndef ASM
-typedef uint32_t CPU_Counter_ticks;
-
 typedef struct {
  uint32_t r[32];

@@ -856,6 +854,8 @@ static inline unsigned int CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h
@@ -803,6 +803,8 @@ static inline uint32_t CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 static inline CPU_Counter_ticks _CPU_Counter_read( void )
 {
  CPU_Counter_ticks value;
--- a/cpukit/score/cpu/riscv/Makefile.am
+++ b/cpukit/score/cpu/riscv/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 libscorecpu_a_SOURCES  = cpu.c
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += riscv-exception-handler.S
 libscorecpu_a_SOURCES += riscv-exception-default.c
 libscorecpu_a_SOURCES += riscv-exception-frame-print.c
--- a/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
@@ -474,6 +474,8 @@ static inline void _CPU_Context_validate( uintptr_t pattern )

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 #ifdef RTEMS_SMP
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/automake/compile.am

 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c context.c
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += sh-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
--- a/cpukit/score/cpu/sh/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/cpu.h
@@ -721,6 +721,8 @@ void _CPU_Exception_frame_print( const CPU_Exception_frame *frame );

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
@@ -1158,6 +1158,8 @@ static inline uint32_t CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 typedef CPU_Counter_ticks ( *SPARC_Counter_read )( void );

 typedef CPU_Counter_ticks ( *SPARC_Counter_difference )(
--- a/cpukit/score/cpu/sparc64/Makefile.am
+++ b/cpukit/score/cpu/sparc64/Makefile.am
@@ -5,6 +5,7 @@ libscorecpu_a_SOURCES =
 libscorecpu_a_SOURCES += context.S
 libscorecpu_a_SOURCES += cpu.c
 libscorecpu_a_SOURCES += interrupt.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += sparc64-exception-frame-print.c
 libscorecpu_a_SOURCES += sparc64-syscall.S
--- a/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
@@ -1032,6 +1032,8 @@ static inline uint32_t CPU_swap_u32(

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(
--- a/cpukit/score/cpu/v850/Makefile.am
+++ b/cpukit/score/cpu/v850/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/automake/compile.am
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES  = cpu.c
 libscorecpu_a_SOURCES += cpu_asm.S
+libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += v850-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
--- a/cpukit/score/cpu/v850/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/v850/include/rtems/score/cpu.h
@@ -934,6 +934,8 @@ static inline uint16_t CPU_swap_u16( uint16_t value )

 typedef uint32_t CPU_Counter_ticks;

+uint32_t _CPU_Counter_frequency( void );
+
 CPU_Counter_ticks _CPU_Counter_read( void );

 static inline CPU_Counter_ticks _CPU_Counter_difference(