Ignition: Make (reset) button acts as power button when system power off

hdl/ignition/IgnitionTarget.bsv

@@ -55,6 +55,7 @@ interface Target;
     method Bool system_power_request_in_progress();
     method Bool system_power_off_in_progress();
     method Bool system_power_on_in_progress();
+    method Bool system_power_aborted();
 endinterface
 
 typedef enum {
@@ -494,11 +495,13 @@ module mkTarget #(Parameters parameters) (Target);
                     initialized &&
                     button_pressed &&
                     !request_in_progress);
-                // If a system power abort happened, issue a power on request
-                // rather than a system reset request.
-                let request_ = system_power_abort ?
-                    SystemPowerOn :
-                    SystemReset;
+                // If the system is powered off, act as a power button rather
+                // than a reset button. The system power transition logic will
+                // clear the abort flag is this power off was in response to a
+                // system power fault/abort.
+                let request_ = system_power_off ?
+                        SystemPowerOn :
+                        SystemReset;
 
                 reset_button_released <= False;
                 request.wset(request_);
@@ -705,6 +708,7 @@ module mkTarget #(Parameters parameters) (Target);
     method system_power_request_in_progress = request_in_progress;
     method system_power_off_in_progress = system_powering_off;
     method system_power_on_in_progress = system_powering_on;
+    method system_power_aborted = system_power_abort;
 endmodule
 
 endpackage: IgnitionTarget

hdl/ignition/test/BUILD

@@ -52,6 +52,7 @@ bluesim_tests('TargetTests',
         'mkSystemResetRequestTest',
         'mkSystemResetShortButtonPressTest',
         'mkSystemResetLongButtonPressTest',
+        'mkSystemPowerOnWhenResetButtonPressTest',
         'mkSystemPowerAbortOnA2FaultTest',
         'mkSystemPowerAbortOnA3FaultTest',
         'mkSystemPowerAbortOnA3FaultTimeoutTest',

hdl/ignition/test/TargetBench.bsv

@@ -27,8 +27,8 @@ interface TargetBench;
     method Action await_ticks_elapsed(Integer n);
     method Action pet_watchdog();
 
-    method Action await_system_power_request_complete();
-    method Action await_system_power_off_complete();
+    method Stmt await_system_power_request_complete();
+    method Stmt await_system_power_off_complete();
     method Stmt assert_system_powering_on(LinkStatus expected_link0_status);
 endinterface
 
@@ -83,11 +83,17 @@ module mkTargetBench #(
         await(ticks_elapsed_ >= fromInteger(tick_duration * n));
     method pet_watchdog = wd.send;
 
-    method Action await_system_power_request_complete() =
-        await(!_target.system_power_request_in_progress);
+    method Stmt await_system_power_request_complete() =
+        seq
+            await(_target.system_power_request_in_progress);
+            await(!_target.system_power_request_in_progress);
+        endseq;
 
-    method Action await_system_power_off_complete() =
-        await(!_target.system_power_off_in_progress);
+    method Stmt await_system_power_off_complete() =
+        seq
+            await(_target.system_power_request_in_progress);
+            await(!_target.system_power_off_in_progress);
+        endseq;
 
     method Stmt assert_system_powering_on(LinkStatus expected_link0_status) =
         seq

hdl/ignition/test/TargetTests.bsv

@@ -460,6 +460,44 @@ module mkSystemResetLongButtonPressTest (Empty);
     endseq);
 endmodule
 
+// Test that the system powers on when the system is powered off and the (reset)
+// button is pressed.
+module mkSystemPowerOnWhenResetButtonPressTest (Empty);
+    TargetBench bench <- mkTargetBench(
+        parameters,
+        4 * parameters.system_power_toggle_cool_down);
+
+    let tx = tpl_2(bench.link.message);
+
+    mkAutoFSM(seq
+        assert_eq(
+            parameters.button_behavior,
+            ResetButton,
+            "expected Target configured with reset button");
+        // Assert that the system initially powers on.
+        bench.link.set_connected(False, True);
+        bench.await_system_power_request_complete();
+        assert_eq(bench.target.system_power, On, "expected system power on");
+
+        // Send Hello's and wait for the controller to be marked present.
+        repeat(3) tx.put(tagged Hello);
+        repeat(2) bench.await_tick();
+
+        // Send a SystemPowerOff request and wait for the request to complete.
+        tx.put(tagged Request SystemPowerOff);
+        bench.await_system_power_request_complete();
+        assert_eq(bench.target.system_power, Off, "expected system power off");
+
+        // Press the (reset) button and assert the system powered on.
+        bench.target.button_event(True);
+        bench.target.button_event(False);
+        bench.await_system_power_request_complete();
+        assert_eq(
+            bench.target.system_power, On,
+            "expected system power on");
+    endseq);
+endmodule
+
 module mkSystemPowerAbortOnA2FaultTest (Empty);
     TargetBench bench <- mkTargetBench(
         parameters,
@@ -670,22 +708,23 @@ module mkPowerButtonRestartAfterSystemPowerAbortTest (Empty);
 
     TargetBench bench <- mkTargetBench(
         parameters_,
-        4 * parameters.system_power_toggle_cool_down);
+        4 * parameters_.system_power_toggle_cool_down);
 
     mkAutoFSM(seq
         // Set an A2 power fault while a system powers on, triggering an
         // emergency power off.
         bench.set_faults(system_faults_power_a2);
-        bench.link.set_connected(False, True);
+        bench.target.button_event(True);
+
         bench.await_system_power_request_complete();
         assert_eq(bench.target.system_power, Off, "expected system power off");
+        assert_true(
+            bench.target.system_power_aborted,
+            "expected system power abort");
 
-        // Resolve A2 power fault.
+        // Resolve A2 power fault and press the button again.
         bench.set_faults(system_faults_none);
-
-        // Press the button.
         bench.target.button_event(True);
-        bench.target.button_event(False);
 
         bench.await_system_power_request_complete();
         assert_eq(