[rom_ext_e2e] Test ROM_EXT reboots with preserved reset reasons

Test that the ROM_EXT clears `PowerOnReset` when it reboots so that it
preserves any boot_svc message sent to itself.

Signed-off-by: Chris Frantz <[email protected]>
(cherry picked from commit a9d9c94)

Author: cfrantz

sw/device/silicon_creator/rom_ext/e2e/BUILD

@@ -2,9 +2,14 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 
+load(
+    "//rules:const.bzl",
+    "CONST",
+)
 load(
     "//rules:otp.bzl",
     "STD_OTP_OVERLAYS",
+    "otp_hex",
     "otp_image",
     "otp_json",
     "otp_partition",
@@ -43,3 +48,24 @@ otp_image(
         ":otp_json_secret2_locked",
     ],
 )
+
+otp_json(
+    name = "otp_json_reset_reason",
+    partitions = [
+        otp_partition(
+            name = "OWNER_SW_CFG",
+            items = {
+                "OWNER_SW_CFG_ROM_PRESERVE_RESET_REASON_EN": otp_hex(CONST.HARDENED_TRUE),
+            },
+        ),
+    ],
+)
+
+otp_image(
+    name = "otp_img_secret2_locked_preserve_reset_rma",
+    src = "//hw/ip/otp_ctrl/data:otp_json_rma",
+    overlays = STD_OTP_OVERLAYS + [
+        ":otp_json_secret2_locked",
+        ":otp_json_reset_reason",
+    ],
+)

sw/device/silicon_creator/rom_ext/e2e/rescue/BUILD

@@ -328,6 +328,44 @@ opentitan_test(
     ],
 )
 
+opentitan_test(
+    name = "rescue_inactivity_timeout_preserved_reset_reason",
+    srcs = [
+        "//sw/device/silicon_creator/rom_ext/e2e/verified_boot:boot_test",
+    ],
+    exec_env = {
+        "//hw/top_earlgrey:fpga_hyper310_rom_ext": None,
+    },
+    fpga = fpga_params(
+        changes_otp = True,
+        # We configure OTP to preserve the reset reason.  This tests that the
+        # ROM_EXT clears power-on-reset before rebooting so that the ROM wont
+        # re-scramble ret-ram and destroy the 'skip_once' request.
+        otp = "//sw/device/silicon_creator/rom_ext/e2e:otp_img_secret2_locked_preserve_reset_rma",
+        # We use the spidfu rom_ext because we can trigger with a GPIO and we
+        # want to simulate the trigger being jammed.
+        rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_spidfu",
+        test_cmd = """
+            --exec="transport init"
+            --exec="fpga clear-bitstream"
+            --exec="fpga load-bitstream {bitstream}"
+            --exec="bootstrap --clear-uart=true {firmware}"
+            # Set the trigger with gpio command to simulate the trigger being jammed.
+            --exec="gpio set --mode PushPull --value true Ioa2"
+            # Check for firmware execution.  We'll enter rescue, timeout,
+            # then reboot and execute firmware.
+            --exec="console --non-interactive --exit-success='{exit_success}' --exit-failure='{exit_failure}'"
+            no-op
+        """,
+    ),
+    deps = [
+        "//sw/device/lib/base:status",
+        "//sw/device/lib/testing/test_framework:ottf_main",
+        "//sw/device/silicon_creator/lib:boot_log",
+        "//sw/device/silicon_creator/lib/drivers:retention_sram",
+    ],
+)
+
 # Check that xmodem rescue is functional when the `RESQ` mode is disabled.
 opentitan_test(
     name = "xmodem_restricted_commands",