From 41cddcc6e194be27d1e4125b961acb94e278552b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 20 May 2019 09:06:48 +0200
Subject: score: Add _Per_CPU_Wait_for_job()

---
 cpukit/include/rtems/score/percpu.h   | 14 ++++++++
 cpukit/score/src/smpmulticastaction.c | 61 +++++++++++++++++++----------------
 2 files changed, 48 insertions(+), 27 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/include/rtems/score/percpu.h b/cpukit/include/rtems/score/percpu.h
index 85e10fbbaa..c661310a8b 100644
--- a/cpukit/include/rtems/score/percpu.h
+++ b/cpukit/include/rtems/score/percpu.h
@@ -811,6 +811,20 @@ void _Per_CPU_Perform_jobs( Per_CPU_Control *cpu );
  */
 void _Per_CPU_Add_job( Per_CPU_Control *cpu, Per_CPU_Job *job );
 
+/**
+ * @brief Waits for the job carried out by the specified processor.
+ *
+ * This function may result in an SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS
+ * fatal error.
+ *
+ * @param[in] cpu The processor carrying out the job.
+ * @param[in] job The job to wait for.
+ */
+void _Per_CPU_Wait_for_job(
+  const Per_CPU_Control *cpu,
+  const Per_CPU_Job     *job
+);
+
 #endif /* defined( RTEMS_SMP ) */
 
 /*
diff --git a/cpukit/score/src/smpmulticastaction.c b/cpukit/score/src/smpmulticastaction.c
index 232b3142fd..facc77af41 100644
--- a/cpukit/score/src/smpmulticastaction.c
+++ b/cpukit/score/src/smpmulticastaction.c
@@ -102,6 +102,36 @@ static void _Per_CPU_Try_perform_jobs( Per_CPU_Control *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 ];
@@ -140,35 +170,12 @@ static void _SMP_Wait_for_action_jobs(
 
   for ( cpu_index = 0; cpu_index < cpu_max; ++cpu_index ) {
     if ( _Processor_mask_Is_set( targets, cpu_index ) ) {
-      const Per_CPU_Job *job;
-      Per_CPU_Control   *cpu;
+      const Per_CPU_Control *cpu;
+      const Per_CPU_Job     *job;
 
-      job = &jobs->Jobs[ cpu_index ];
       cpu = _Per_CPU_Get_by_index( cpu_index );
-
-      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;
-        }
-      }
+      job = &jobs->Jobs[ cpu_index ];
+      _Per_CPU_Wait_for_job( cpu, job );
     }
   }
 }
-- 
cgit v1.2.3