From fad01e6cf95f98adaca3157faa8b96c19296a68e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 10 Jun 2021 09:55:42 +0200 Subject: score: Add PER_CPU_DATA_NEED_INITIALIZATION() Make the initialization of the per-CPU data optional. Change license to BSD-2-Clause according to file history and re-licensing agreement. Update #3053. --- cpukit/score/src/percpudata.c | 98 +++++++++++++++++++++++++++++++++++++++++++ cpukit/score/src/smp.c | 42 ------------------- 2 files changed, 98 insertions(+), 42 deletions(-) create mode 100644 cpukit/score/src/percpudata.c (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/percpudata.c b/cpukit/score/src/percpudata.c new file mode 100644 index 0000000000..c81c1b6a16 --- /dev/null +++ b/cpukit/score/src/percpudata.c @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSScorePerCPUData + * + * @brief This source file contains the per-CPU data linker set and its system + * initialization handler. + */ + +/* + * Copyright (C) 2019, 2021 embedded brains GmbH (http://www.embedded-brains.de) + * + * 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 +#include +#include +#include +#include + +#include + +RTEMS_LINKER_RWSET( + _Per_CPU_Data, +#if defined(RTEMS_SMP) + /* + * In SMP configurations, prevent false cache line sharing of per-processor + * data with a proper alignment. + */ + RTEMS_ALIGNED( CPU_CACHE_LINE_BYTES ) +#endif + char +); + +#if defined(RTEMS_SMP) +static void _Per_CPU_Data_initialize( void ) +{ + uintptr_t size; + + size = RTEMS_LINKER_SET_SIZE( _Per_CPU_Data ); + + if ( size > 0 ) { + const Memory_Information *mem; + Per_CPU_Control *cpu; + uint32_t cpu_index; + uint32_t cpu_max; + + mem = _Memory_Get(); + cpu = _Per_CPU_Get_by_index( 0 ); + cpu->data = RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data ); + + cpu_max = rtems_configuration_get_maximum_processors(); + + for ( cpu_index = 1 ; cpu_index < cpu_max ; ++cpu_index ) { + cpu = _Per_CPU_Get_by_index( cpu_index ); + cpu->data = _Memory_Allocate( mem, size, CPU_CACHE_LINE_BYTES ); + + if( cpu->data == NULL ) { + _Internal_error( INTERNAL_ERROR_NO_MEMORY_FOR_PER_CPU_DATA ); + } + + memcpy( cpu->data, RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data ), size); + } + } +} + +RTEMS_SYSINIT_ITEM( + _Per_CPU_Data_initialize, + RTEMS_SYSINIT_PER_CPU_DATA, + RTEMS_SYSINIT_ORDER_MIDDLE +); +#endif diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c index 2a3405c6ef..0488464da0 100644 --- a/cpukit/score/src/smp.c +++ b/cpukit/score/src/smp.c @@ -27,14 +27,9 @@ #include #include -#include -#include #include #include #include -#include - -#include #if CPU_USE_DEFERRED_FP_SWITCH == TRUE #error "deferred FP switch not implemented for SMP" @@ -264,40 +259,3 @@ void _SMP_Send_message_multicast( } } } - -static void _Per_CPU_Data_initialize( void ) -{ - uintptr_t size; - - size = RTEMS_LINKER_SET_SIZE( _Per_CPU_Data ); - - if ( size > 0 ) { - const Memory_Information *mem; - Per_CPU_Control *cpu; - uint32_t cpu_index; - uint32_t cpu_max; - - mem = _Memory_Get(); - cpu = _Per_CPU_Get_by_index( 0 ); - cpu->data = RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data ); - - cpu_max = rtems_configuration_get_maximum_processors(); - - for ( cpu_index = 1 ; cpu_index < cpu_max ; ++cpu_index ) { - cpu = _Per_CPU_Get_by_index( cpu_index ); - cpu->data = _Memory_Allocate( mem, size, CPU_CACHE_LINE_BYTES ); - - if( cpu->data == NULL ) { - _Internal_error( INTERNAL_ERROR_NO_MEMORY_FOR_PER_CPU_DATA ); - } - - memcpy( cpu->data, RTEMS_LINKER_SET_BEGIN( _Per_CPU_Data ), size); - } - } -} - -RTEMS_SYSINIT_ITEM( - _Per_CPU_Data_initialize, - RTEMS_SYSINIT_PER_CPU_DATA, - RTEMS_SYSINIT_ORDER_MIDDLE -); -- cgit v1.2.3