1 files changed, 63 insertions, 24 deletions

diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c
index 3f276a48fc..21673521b9 100644
--- a/testsuites/smptests/smpfatal01/init.c
+++ b/testsuites/smptests/smpfatal01/init.c
@@ -1,15 +1,28 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2014 embedded brains GmbH & Co. KG
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems@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.
  *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
+ * 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
@@ -32,6 +45,8 @@ const char rtems_test_name[] = "SMPFATAL 1";
 
 static uint32_t main_cpu;
 
+static uint32_t other_cpu;
+
 static SMP_barrier_Control barrier = SMP_BARRIER_CONTROL_INITIALIZER;
 
 static void Init(rtems_task_argument arg)
@@ -45,35 +60,59 @@ static void fatal_extension(
   rtems_fatal_code code
 )
 {
-  SMP_barrier_State barrier_state = SMP_BARRIER_STATE_INITIALIZER;
+  assert(!always_set_to_false);
 
   if (source == RTEMS_FATAL_SOURCE_SMP) {
+    SMP_barrier_State barrier_state = SMP_BARRIER_STATE_INITIALIZER;
+    uint32_t cpu_count = rtems_scheduler_get_processor_maximum();
     uint32_t self = rtems_scheduler_get_processor();
 
-    assert(!always_set_to_false);
-    assert(code == SMP_FATAL_SHUTDOWN);
+    if (self == other_cpu) {
+      assert(code == SMP_FATAL_SHUTDOWN);
+    } else {
+      assert(code == SMP_FATAL_SHUTDOWN_RESPONSE);
+    }
 
-    if (self == main_cpu) {
+    _SMP_barrier_Wait(&barrier, &barrier_state, cpu_count);
+
+    if (self == other_cpu) {
       uint32_t cpu;
 
-      for (cpu = 0; cpu < MAX_CPUS; ++cpu) {
+      for (cpu = 0; cpu < cpu_count; ++cpu) {
         const Per_CPU_Control *per_cpu = _Per_CPU_Get_by_index( cpu );
-        Per_CPU_State state = per_cpu->state;
+        Per_CPU_State state = _Per_CPU_Get_state(per_cpu);
 
         assert(state == PER_CPU_STATE_SHUTDOWN);
       }
 
+      for (cpu = cpu_count; cpu < MAX_CPUS; ++cpu) {
+        const Per_CPU_Control *per_cpu = _Per_CPU_Get_by_index( cpu );
+        Per_CPU_State state = _Per_CPU_Get_state(per_cpu);
+
+        assert(state == PER_CPU_STATE_INITIAL);
+      }
+
       TEST_END();
+    } else {
+      _SMP_barrier_Wait(&barrier, &barrier_state, cpu_count);
     }
   }
+}
 
-  _SMP_barrier_Wait(
-    &barrier,
-    &barrier_state,
-    rtems_scheduler_get_processor_maximum()
-  );
+static void shutdown_handler(void *arg)
+{
+  _SMP_Request_shutdown();
+  _SMP_Fatal(SMP_FATAL_SHUTDOWN);
 }
 
+static const Per_CPU_Job_context shutdown_context = {
+  .handler = shutdown_handler
+};
+
+static Per_CPU_Job shutdown_job = {
+  .context = &shutdown_context
+};
+
 static rtems_status_code test_driver_init(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
@@ -89,10 +128,11 @@ static rtems_status_code test_driver_init(
   assert(rtems_configuration_get_maximum_processors() == MAX_CPUS);
 
   main_cpu = self;
+  other_cpu = (self + 1) % cpu_count;
 
   for (cpu = 0; cpu < MAX_CPUS; ++cpu) {
     const Per_CPU_Control *per_cpu = _Per_CPU_Get_by_index( cpu );
-    Per_CPU_State state = per_cpu->state;
+    Per_CPU_State state = _Per_CPU_Get_state(per_cpu);
 
     if (cpu == self) {
       assert(state == PER_CPU_STATE_INITIAL);
@@ -107,10 +147,9 @@ static rtems_status_code test_driver_init(
   }
 
   if (cpu_count > 1) {
-    uint32_t other = (self + 1) % cpu_count;
-    Per_CPU_Control *per_cpu = _Per_CPU_Get_by_index( other );
+    Per_CPU_Control *per_cpu = _Per_CPU_Get_by_index( other_cpu );
 
-    per_cpu->state = PER_CPU_STATE_SHUTDOWN;
+    _Per_CPU_Submit_job(per_cpu, &shutdown_job);
   } else {
     TEST_END();
     exit(0);