From 3291b2a7d558d2b4095cdb8abba84ff3ed0dc59b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 17 Sep 2021 08:49:56 +0200 Subject: score: Ensure only one CPU if required Issue the new fatal SMP error SMP_FATAL_SCHEDULER_REQUIRES_EXACTLY_ONE_PROCESSOR if the system starts with not exactly one processor and an uniprocessor scheduler is configured. --- cpukit/include/rtems/score/smpimpl.h | 3 ++- cpukit/include/rtems/sysinit.h | 1 + cpukit/score/src/schedulerdefaultpinunpindonothing.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) (limited to 'cpukit') diff --git a/cpukit/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h index 7c3e777299..e259105084 100644 --- a/cpukit/include/rtems/score/smpimpl.h +++ b/cpukit/include/rtems/score/smpimpl.h @@ -72,7 +72,8 @@ typedef enum { SMP_FATAL_SHUTDOWN_RESPONSE, SMP_FATAL_START_OF_MANDATORY_PROCESSOR_FAILED, SMP_FATAL_SCHEDULER_PIN_OR_UNPIN_NOT_SUPPORTED, - SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS + SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS, + SMP_FATAL_SCHEDULER_REQUIRES_EXACTLY_ONE_PROCESSOR } SMP_Fatal_code; /** diff --git a/cpukit/include/rtems/sysinit.h b/cpukit/include/rtems/sysinit.h index 3e85aa9a2b..e3d70230c7 100644 --- a/cpukit/include/rtems/sysinit.h +++ b/cpukit/include/rtems/sysinit.h @@ -43,6 +43,7 @@ extern "C" { #define RTEMS_SYSINIT_INITIAL_EXTENSIONS 000500 #define RTEMS_SYSINIT_MP_EARLY 000600 #define RTEMS_SYSINIT_DATA_STRUCTURES 000700 +#define RTEMS_SYSINIT_SCHEDULER 000780 #define RTEMS_SYSINIT_MP 000800 #define RTEMS_SYSINIT_USER_EXTENSIONS 000900 #define RTEMS_SYSINIT_CLASSIC_TASKS 000a00 diff --git a/cpukit/score/src/schedulerdefaultpinunpindonothing.c b/cpukit/score/src/schedulerdefaultpinunpindonothing.c index f7bab4f661..f3ecb0b718 100644 --- a/cpukit/score/src/schedulerdefaultpinunpindonothing.c +++ b/cpukit/score/src/schedulerdefaultpinunpindonothing.c @@ -39,6 +39,9 @@ #endif #include +#include +#include +#include void _Scheduler_default_Pin_or_unpin_do_nothing( const Scheduler_Control *scheduler, @@ -52,3 +55,19 @@ void _Scheduler_default_Pin_or_unpin_do_nothing( (void) node; (void) cpu; } + +static void _Scheduler_Ensure_exactly_one_processor( void ) +{ + if ( _SMP_Get_processor_maximum() != 1 ) { + _Terminate( + RTEMS_FATAL_SOURCE_SMP, + SMP_FATAL_SCHEDULER_REQUIRES_EXACTLY_ONE_PROCESSOR + ); + } +} + +RTEMS_SYSINIT_ITEM( + _Scheduler_Ensure_exactly_one_processor, + RTEMS_SYSINIT_SCHEDULER, + RTEMS_SYSINIT_ORDER_MIDDLE +); -- cgit v1.2.3