sparc: Move CPU counter implementation

Enable a BSP-specific CPU counter implementation.

Update #4954.

5 files changed, 10 insertions, 285 deletions

diff --git a/cpukit/score/cpu/sparc/cpu_asm.S b/cpukit/score/cpu/sparc/cpu_asm.S
index e742acae5a..fd7186b499 100644
--- a/cpukit/score/cpu/sparc/cpu_asm.S
+++ b/cpukit/score/cpu/sparc/cpu_asm.S
@@ -523,9 +523,7 @@ dont_do_the_window:
         bnz      dont_switch_stacks      ! No, then do not switch stacks
 
 #if defined(RTEMS_PROFILING)
-         sethi   %hi(_SPARC_Counter), %o5
-        ld       [%o5 + %lo(_SPARC_Counter)], %l4
-        call     %l4
+        call     SYM(_SPARC_Counter_read_ISR_disabled)
          nop
         mov      %o0, %o5
 #else
@@ -604,7 +602,7 @@ dont_switch_stacks:
         cmp      %l7, 0
         bne      profiling_not_outer_most_exit
          nop
-        call     %l4                    ! Call _SPARC_Counter.counter_read
+        call     SYM(_SPARC_Counter_read_ISR_disabled)
          mov     %g1, %l4               ! Save previous interrupt status
         mov      %o0, %o2               ! o2 = 3rd arg = interrupt exit instant
         mov      %l3, %o1               ! o1 = 2nd arg = interrupt entry instant
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
index 7a3588f812..a21cef371f 100644
--- a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
@@ -1151,31 +1151,7 @@ typedef uint32_t CPU_Counter_ticks;
 
 uint32_t _CPU_Counter_frequency( void );
 
-typedef CPU_Counter_ticks ( *SPARC_Counter_read )( void );
-
-/*
- * The SPARC processors supported by RTEMS have no built-in CPU counter
- * support.  We have to use some hardware counter module for this purpose, for
- * example the GPTIMER instance used by the clock driver.  The BSP must provide
- * an implementation of the CPU counter read function.  This allows the use of
- * dynamic hardware enumeration.
- */
-typedef struct {
-  SPARC_Counter_read                read_isr_disabled;
-  SPARC_Counter_read                read;
-  volatile const CPU_Counter_ticks *counter_register;
-  volatile const uint32_t          *pending_register;
-  uint32_t                          pending_mask;
-  CPU_Counter_ticks                 accumulated;
-  CPU_Counter_ticks                 interval;
-} SPARC_Counter;
-
-extern const SPARC_Counter _SPARC_Counter;
-
-static inline CPU_Counter_ticks _CPU_Counter_read( void )
-{
-  return ( *_SPARC_Counter.read )();
-}
+CPU_Counter_ticks _CPU_Counter_read( void );
 
 /** Type that can store a 32-bit integer or a pointer. */
 typedef uintptr_t CPU_Uint32ptr;
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
index 459b981ae5..9697209a97 100644
--- a/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
@@ -258,6 +258,13 @@ static inline void *_CPU_Get_TLS_thread_pointer(
   return (void *) context->g7;
 }
 
+#if defined(RTEMS_PROFILING)
+/**
+ * @brief Reads the CPU counter while interrupts are disabled.
+ */
+CPU_Counter_ticks _SPARC_Counter_read_ISR_disabled( void );
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h b/cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h
deleted file mode 100644
index d9be984179..0000000000
--- a/cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-
-/**
- * @file
- *
- * @ingroup RTEMSScoreCPUSPARC
- *
- * @brief This header file provides interfaces used by the SPARC port of RTEMS.
- */
-
-/*
- * Copyright (C) 2016, 2018 embedded brains GmbH & Co. KG
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RTEMS_SCORE_SPARCIMPL_H
-#define _RTEMS_SCORE_SPARCIMPL_H
-
-#include <rtems/score/cpu.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct timecounter;
-
-/*
- * Provides a mutable alias to _SPARC_Counter for use in
- * _SPARC_Counter_initialize().  The _SPARC_Counter and _SPARC_Counter_mutable
- * are defined via the SPARC_COUNTER_DEFINITION define.
- */
-extern SPARC_Counter _SPARC_Counter_mutable;
-
-void _SPARC_Counter_at_tick_clock( void );
-
-CPU_Counter_ticks _SPARC_Counter_read_default( void );
-
-CPU_Counter_ticks _SPARC_Counter_read_up( void );
-
-CPU_Counter_ticks _SPARC_Counter_read_down( void );
-
-CPU_Counter_ticks _SPARC_Counter_read_clock_isr_disabled( void );
-
-CPU_Counter_ticks _SPARC_Counter_read_clock( void );
-
-CPU_Counter_ticks _SPARC_Counter_read_asr23( void );
-
-uint32_t _SPARC_Get_timecount_up( struct timecounter * );
-
-uint32_t _SPARC_Get_timecount_down( struct timecounter * );
-
-uint32_t _SPARC_Get_timecount_clock( struct timecounter * );
-
-uint32_t _SPARC_Get_timecount_asr23( struct timecounter * );
-
-/*
- * Defines the _SPARC_Counter and _SPARC_Counter_mutable global variables.
- * Place this define in the global file scope of the CPU counter support file
- * of the BSP.
- */
-#define SPARC_COUNTER_DEFINITION \
-  __asm__ ( \
-    "\t.global\t_SPARC_Counter\n" \
-    "\t.global\t_SPARC_Counter_mutable\n" \
-    "\t.section\t.data._SPARC_Counter,\"aw\",@progbits\n" \
-    "\t.align\t4\n" \
-    "\t.type\t_SPARC_Counter, #object\n" \
-    "\t.size\t_SPARC_Counter, 28\n" \
-    "_SPARC_Counter:\n" \
-    "_SPARC_Counter_mutable:\n" \
-    "\t.long\t_SPARC_Counter_read_default\n" \
-    "\t.long\t_SPARC_Counter_read_default\n" \
-    "\t.long\t0\n" \
-    "\t.long\t0\n" \
-    "\t.long\t0\n" \
-    "\t.long\t0\n" \
-    "\t.long\t0\n" \
-    "\t.previous\n" \
-  )
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _RTEMS_SCORE_SPARCIMPL_H */
diff --git a/cpukit/score/cpu/sparc/sparc-counter-asm.S b/cpukit/score/cpu/sparc/sparc-counter-asm.S
deleted file mode 100644
index 890876eff1..0000000000
--- a/cpukit/score/cpu/sparc/sparc-counter-asm.S
+++ /dev/null
@@ -1,151 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-
-/*
- * Copyright (C) 2016, 2018 embedded brains GmbH & Co. KG
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems/asm.h>
-
-	/*
-	 * All functions except _SPARC_Counter_read_clock() in this module are
-	 * sometimes called with traps disabled.
-	 */
-
-	.section	".text"
-	.align	4
-
-	PUBLIC(_SPARC_Counter_read_default)
-SYM(_SPARC_Counter_read_default):
-	sethi	%hi(_SPARC_Counter + 12), %o1
-	ld	[%o1 + %lo(_SPARC_Counter + 12)], %o0
-	add	%o0, 1, %o0
-	st	%o0, [%o1 + %lo(_SPARC_Counter + 12)]
-	jmp	%o7 + 8
-	 nop
-
-	PUBLIC(_SPARC_Counter_read_up)
-	PUBLIC(_SPARC_Get_timecount_up)
-SYM(_SPARC_Counter_read_up):
-SYM(_SPARC_Get_timecount_up):
-	sethi	%hi(_SPARC_Counter + 8), %o0
-	ld	[%o0 + %lo(_SPARC_Counter + 8)], %o0
-	jmp	%o7 + 8
-	 ld	[%o0], %o0
-
-	PUBLIC(_SPARC_Counter_read_down)
-	PUBLIC(_SPARC_Get_timecount_down)
-SYM(_SPARC_Counter_read_down):
-SYM(_SPARC_Get_timecount_down):
-	sethi	%hi(_SPARC_Counter + 8), %o0
-	ld	[%o0 + %lo(_SPARC_Counter + 8)], %o0
-	ld	[%o0], %o0
-	jmp	%o7 + 8
-	 xnor	%g0, %o0, %o0
-
-	/*
-	 * For the corresponding C code is something like this:
-	 *
-	 * CPU_Counter_ticks _SPARC_Counter_read_clock_isr_disabled( void )
-	 * {
-	 *   const SPARC_Counter *ctr;
-	 *   CPU_Counter_ticks    ticks;
-	 *   CPU_Counter_ticks    accumulated;
-	 *
-	 *   ctr = &_SPARC_Counter;
-	 *   ticks = *ctr->counter_register;
-	 *   accumulated = ctr->accumulated;
-	 *
-	 *   if ( ( *ctr->pending_register & ctr->pending_mask ) != 0 ) {
-	 *     ticks = *ctr->counter_register;
-	 *     accumulated += ctr->interval;
-	 *   }
-	 *
-	 *   return accumulated - ticks;
-	 * }
-	 */
-	PUBLIC(_SPARC_Counter_read_clock_isr_disabled)
-SYM(_SPARC_Counter_read_clock_isr_disabled):
-	sethi	%hi(_SPARC_Counter), %o5
-	or	%o5, %lo(_SPARC_Counter), %o5
-	ld	[%o5 + 8], %o3
-	ld	[%o5 + 12], %o4
-	ld	[%o5 + 16], %o2
-	ld	[%o3], %o0
-	ld	[%o4], %o1
-	btst	%o1, %o2
-	bne	.Lpending_isr_disabled
-	 ld	[%o5 + 20], %o4
-	jmp	%o7 + 8
-	 sub	%o4, %o0, %o0
-.Lpending_isr_disabled:
-	ld	[%o5 + 24], %o5
-	ld	[%o3], %o0
-	add	%o4, %o5, %o4
-	jmp	%o7 + 8
-	 sub	%o4, %o0, %o0
-
-	/*
-	 * For the corresponding C code see
-	 * _SPARC_Counter_read_clock_isr_disabled() above.
-	 */
-	PUBLIC(_SPARC_Counter_read_clock)
-	PUBLIC(_SPARC_Get_timecount_clock)
-SYM(_SPARC_Counter_read_clock):
-SYM(_SPARC_Get_timecount_clock):
-	sethi	%hi(_SPARC_Counter), %o5
-	or	%o5, %lo(_SPARC_Counter), %o5
-	ta	SPARC_SWTRAP_IRQDIS
-	ld	[%o5 + 8], %o3
-	ld	[%o5 + 12], %o4
-	ld	[%o5 + 16], %o2
-	ld	[%o3], %o0
-	ld	[%o4], %o1
-	btst	%o1, %o2
-	bne	.Lpending
-	 ld	[%o5 + 20], %o4
-	ta	SPARC_SWTRAP_IRQEN
-#ifdef __FIX_LEON3FT_TN0018
-	/* A nop is added to work around the GRLIB-TN-0018 errata */
-	nop
-#endif
-	jmp	%o7 + 8
-	 sub	%o4, %o0, %o0
-.Lpending:
-	ld	[%o5 + 24], %o5
-	ld	[%o3], %o0
-	ta	SPARC_SWTRAP_IRQEN
-	add	%o4, %o5, %o4
-	jmp	%o7 + 8
-	 sub	%o4, %o0, %o0
-
-	PUBLIC(_SPARC_Counter_read_asr23)
-	PUBLIC(_SPARC_Get_timecount_asr23)
-SYM(_SPARC_Counter_read_asr23):
-SYM(_SPARC_Get_timecount_asr23):
-	jmp	%o7 + 8
-	 mov	%asr23, %o0