1 files changed, 4 insertions, 137 deletions

diff --git a/cpukit/score/src/smpmulticastaction.c b/cpukit/score/src/smpmulticastaction.c
index 55c495a2cf..4eec04c50d 100644
--- a/cpukit/score/src/smpmulticastaction.c
+++ b/cpukit/score/src/smpmulticastaction.c
@@ -3,16 +3,14 @@
 /**
  * @file
  *
- * @ingroup RTEMSScorePerCPU
  * @ingroup RTEMSScoreSMP
  *
- * @brief This source file contains the implementation of _Per_CPU_Add_job(),
- *   _Per_CPU_Perform_jobs(), _Per_CPU_Wait_for_job(), _SMP_Broadcast_action(),
- *   _SMP_Multicast_action(), _SMP_Othercast_action(), and _SMP_Synchronize().
+ * @brief This source file contains the implementation of
+ *   _SMP_Multicast_action().
  */
 
 /*
- * Copyright (C) 2019 embedded brains GmbH
+ * Copyright (C) 2019 embedded brains GmbH & Co. KG
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,106 +41,6 @@
 #include <rtems/score/smpimpl.h>
 #include <rtems/score/assert.h>
 
-#define _Per_CPU_Jobs_ISR_disable_and_acquire( cpu, lock_context ) \
-  _ISR_lock_ISR_disable_and_acquire( &( cpu )->Jobs.Lock, lock_context )
-
-#define _Per_CPU_Jobs_release_and_ISR_enable( cpu, lock_context ) \
-  _ISR_lock_Release_and_ISR_enable( &( cpu )->Jobs.Lock, lock_context )
-
-void _Per_CPU_Perform_jobs( Per_CPU_Control *cpu )
-{
-  ISR_lock_Context  lock_context;
-  Per_CPU_Job      *job;
-
-  _Per_CPU_Jobs_ISR_disable_and_acquire( cpu, &lock_context );
-  job = cpu->Jobs.head;
-  cpu->Jobs.head = NULL;
-  _Per_CPU_Jobs_release_and_ISR_enable( cpu, &lock_context );
-
-  while ( job != NULL ) {
-    const Per_CPU_Job_context *context;
-    Per_CPU_Job               *next;
-
-    context = job->context;
-    next = job->next;
-    ( *context->handler )( context->arg );
-    _Atomic_Store_ulong( &job->done, PER_CPU_JOB_DONE, ATOMIC_ORDER_RELEASE );
-
-    job = next;
-  }
-}
-
-void _Per_CPU_Add_job( Per_CPU_Control *cpu, Per_CPU_Job *job )
-{
-  ISR_lock_Context lock_context;
-
-  _Atomic_Store_ulong( &job->done, 0, ATOMIC_ORDER_RELAXED );
-  _Assert( job->next == NULL );
-
-  _Per_CPU_Jobs_ISR_disable_and_acquire( cpu, &lock_context );
-
-  if ( cpu->Jobs.head == NULL ) {
-    cpu->Jobs.head = job;
-  } else {
-    *cpu->Jobs.tail = job;
-  }
-
-  cpu->Jobs.tail = &job->next;
-
-  _Per_CPU_Jobs_release_and_ISR_enable( cpu, &lock_context );
-}
-
-static void _Per_CPU_Try_perform_jobs( Per_CPU_Control *cpu_self )
-{
-  unsigned long message;
-
-  message = _Atomic_Load_ulong( &cpu_self->message, ATOMIC_ORDER_RELAXED );
-
-  if ( ( message & SMP_MESSAGE_PERFORM_JOBS ) != 0 ) {
-    bool success;
-
-    success = _Atomic_Compare_exchange_ulong(
-      &cpu_self->message, &message,
-      message & ~SMP_MESSAGE_PERFORM_JOBS, ATOMIC_ORDER_RELAXED,
-      ATOMIC_ORDER_RELAXED
-    );
-
-    if ( success ) {
-      _Per_CPU_Perform_jobs( cpu_self );
-    }
-  }
-}
-
-void _Per_CPU_Wait_for_job(
-  const Per_CPU_Control *cpu,
-  const Per_CPU_Job     *job
-)
-{
-  while (
-    _Atomic_Load_ulong( &job->done, ATOMIC_ORDER_ACQUIRE )
-      != PER_CPU_JOB_DONE
-  ) {
-    switch ( cpu->state ) {
-      case PER_CPU_STATE_INITIAL:
-      case PER_CPU_STATE_READY_TO_START_MULTITASKING:
-      case PER_CPU_STATE_REQUEST_START_MULTITASKING:
-        _CPU_SMP_Processor_event_broadcast();
-        /* Fall through */
-      case PER_CPU_STATE_UP:
-        /*
-         * Calling this function with the current processor is intentional.
-         * We have to perform our own jobs here in case inter-processor
-         * interrupts are not working.
-         */
-        _Per_CPU_Try_perform_jobs( _Per_CPU_Get() );
-        break;
-      default:
-        _SMP_Fatal( SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS );
-        break;
-    }
-  }
-}
-
 typedef struct {
   Per_CPU_Job_context Context;
   Per_CPU_Job         Jobs[ CPU_MAXIMUM_PROCESSORS ];
@@ -165,8 +63,7 @@ static void _SMP_Issue_action_jobs(
       job->context = &jobs->Context;
       cpu = _Per_CPU_Get_by_index( cpu_index );
 
-      _Per_CPU_Add_job( cpu, job );
-      _SMP_Send_message( cpu_index, SMP_MESSAGE_PERFORM_JOBS );
+      _Per_CPU_Submit_job( cpu, job );
     }
   }
 }
@@ -209,33 +106,3 @@ void _SMP_Multicast_action(
   _SMP_Issue_action_jobs( targets, &jobs, cpu_max );
   _SMP_Wait_for_action_jobs( targets, &jobs, cpu_max );
 }
-
-void _SMP_Broadcast_action(
-  SMP_Action_handler  handler,
-  void               *arg
-)
-{
-  _SMP_Multicast_action( _SMP_Get_online_processors(), handler, arg );
-}
-
-void _SMP_Othercast_action(
-  SMP_Action_handler  handler,
-  void               *arg
-)
-{
-  Processor_mask targets;
-
-  _Processor_mask_Assign( &targets, _SMP_Get_online_processors() );
-  _Processor_mask_Clear( &targets, _SMP_Get_current_processor() );
-  _SMP_Multicast_action( &targets, handler, arg );
-}
-
-static void _SMP_Do_nothing_action( void *arg )
-{
-  /* Do nothing */
-}
-
-void _SMP_Synchronize( void )
-{
-  _SMP_Othercast_action( _SMP_Do_nothing_action, NULL );
-}