[silicon_creator,e2e] Do not clear bitstream in rescue tests

Those tests do not change the OTP so clearing the bitstream is
unnecessary and makes the test much slower.

Signed-off-by: Amaury Pouly <[email protected]>

Author: pamaury

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

@@ -110,15 +110,13 @@ _CONFIGS = {
             binaries = {
                 ":boot_test_{}".format(name): "payload",
             },
-            changes_otp = True,
             params = config["params"],
             rom_ext = config["rom_ext"],
             setup = config["setup"],
             slot = position["slot"],
             tags = config["tags"],
             test_cmd = """
                 --exec="transport init"
-                --exec="fpga clear-bitstream"
                 --exec="fpga load-bitstream {bitstream}"
                 {setup}
                 --exec="bootstrap --clear-uart=true {rom_ext}"
@@ -171,7 +169,6 @@ genrule(
                 ":boot_test_{}".format(name): "payload",
                 ":bad_rom_ext": "bad_rom_ext",
             },
-            changes_otp = True,
             exit_failure = _RESCUE_ROMEXT_RESULTS[name == rxslot]["failure"],
             exit_success = _RESCUE_ROMEXT_RESULTS[name == rxslot]["success"].format(slot = name),
             image_name = "/tmp/rescue_rom_ext_{}.img".format(name),
@@ -211,16 +208,15 @@ genrule(
                 ":boot_test_slot_a": "slot_a",
                 ":boot_test_slot_b": "slot_b",
             },
-            changes_otp = True,
             params = config["params"],
             rom_ext = config["rom_ext"],
             setup = config["setup"],
             tags = config["tags"],
             test_cmd = """
                 --exec="transport init"
-                --exec="fpga clear-bitstream"
                 --exec="fpga load-bitstream {bitstream}"
                 --exec="bootstrap --clear-uart=true {firmware}"
+                --exec="console --non-interactive --timeout=100ms"
                 {setup}
                 --exec="no-op --info='##### Set next slot via the rescue protocol'"
                 --exec="rescue {params} boot-svc set-next-bl0-slot --next=SlotB --get-response=false"
@@ -250,14 +246,12 @@ genrule(
                 ":boot_test_slot_a": "slot_a",
                 ":boot_test_slot_b": "slot_b",
             },
-            changes_otp = True,
             params = config["params"],
             rom_ext = config["rom_ext"],
             setup = config["setup"],
             tags = config["tags"],
             test_cmd = """
                 --exec="transport init"
-                --exec="fpga clear-bitstream"
                 --exec="fpga load-bitstream {bitstream}"
                 --exec="bootstrap --clear-uart=true {firmware}"
                 {setup}
@@ -292,7 +286,6 @@ genrule(
             binaries = {
                 ":boot_test_slot_a": "payload",
             },
-            changes_otp = True,
             rate = rate,
             test_cmd = """
                 --exec="transport init"
@@ -327,7 +320,6 @@ genrule(
             binaries = {
                 ":boot_test_slot_a": "payload",
             },
-            changes_otp = True,
             rate = rate,
             test_cmd = """
                 --exec="transport init"
@@ -368,7 +360,6 @@ opentitan_test(
         binaries = {
             ":boot_test_slot_a": "payload",
         },
-        changes_otp = True,
         rom_ext = "//sw/device/silicon_creator/rom_ext/e2e/rescue/testdata:rom_ext_rescue_protocol_0",
         test_cmd = """
             --exec="transport init"
@@ -395,11 +386,9 @@ opentitan_test(
         "//hw/top_earlgrey:fpga_cw340_rom_ext": None,
     },
     fpga = fpga_params(
-        changes_otp = True,
         rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_xmodem_timeout",
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             --exec="bootstrap --clear-uart=true {firmware}"
             # Trigger rescue and do nothing.  We expect the inactivity timer to
@@ -437,7 +426,6 @@ opentitan_test(
         "//hw/top_earlgrey:fpga_cw340_rom_ext": None,
     },
     fpga = fpga_params(
-        changes_otp = True,
         # We configure OTP to preserve the reset reason and set the watchdog timeout
         # to one second.
         otp = "//sw/device/silicon_creator/rom_ext/e2e:otp_img_secret2_locked_preserve_reset_prod",
@@ -446,7 +434,6 @@ opentitan_test(
         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.
@@ -476,13 +463,11 @@ opentitan_test(
         "//hw/top_earlgrey:fpga_cw340_rom_ext": None,
     },
     fpga = fpga_params(
-        changes_otp = True,
         exit_failure = "ok: ",
         exit_success = "error: mode not allowed",
         rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_xmodem_restricted_commands",
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             --exec="bootstrap --clear-uart=true {firmware}"
             # Trigger rescue and make sure we can get the device ID.
@@ -514,13 +499,11 @@ opentitan_test(
         "//hw/top_earlgrey:fpga_cw340_rom_ext": None,
     },
     fpga = fpga_params(
-        changes_otp = True,
         params = "-p spi-dfu -t gpio -v +Ioa2",
         rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_spidfu_restricted_commands",
         setup = "--exec=\"gpio set --mode OpenDrain Ioa2\"",
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             {setup}
             --exec="bootstrap --clear-uart=true {firmware}"
@@ -546,7 +529,6 @@ opentitan_test(
         },
         fpga = fpga_params(
             assemble = "",
-            changes_otp = True,
             exit_success = "BFV:05525304\r\n",
             rom_ext = config.get(
                 "alt_rom_ext",
@@ -556,7 +538,6 @@ opentitan_test(
             tags = config["tags"],
             test_cmd = """
                 --exec="transport init"
-                --exec="fpga clear-bitstream"
                 --exec="fpga load-bitstream {bitstream}"
                 {setup}
                 # Load only the ROM_EXT so the boot will fail because of no firmware.
@@ -579,11 +560,9 @@ opentitan_test(
         },
         fpga = fpga_params(
             assemble = "",
-            changes_otp = True,
             params = config["params"],
             rom_ext = config["rom_ext"],
             test_cmd = """
-            --clear-bitstream
             --bootstrap={rom_ext}
             rescue {params} --action=get-boot-log
             """,
@@ -602,12 +581,10 @@ opentitan_test(
         },
         fpga = fpga_params(
             assemble = "",
-            changes_otp = True,
             device_id = DEVICE_ID,
             params = config["params"],
             rom_ext = config["rom_ext"],
             test_cmd = """
-            --clear-bitstream
             --bootstrap={rom_ext}
             --device-id={device_id}
             rescue {params} --action=get-device-id
@@ -631,10 +608,8 @@ opentitan_test(
                 config["rom_ext"]: "romext",
                 "//sw/device/silicon_creator/rom_ext/e2e/attestation:print_certs": "firmware",
             },
-            changes_otp = True,
             params = config["params"],
             test_cmd = """
-            --clear-bitstream
             --bootstrap={firmware}
             rescue {params} --action=get-owner-page
             """,
@@ -656,9 +631,7 @@ opentitan_test(
             "//sw/device/silicon_creator/rom_ext:rom_ext_xmodem_rescue_disability": "romext",
             "//sw/device/silicon_creator/rom_ext/e2e/attestation:print_certs": "firmware",
         },
-        changes_otp = True,
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue --action=disability
         """,
@@ -678,10 +651,8 @@ opentitan_test(
             "//sw/device/silicon_creator/rom_ext:rom_ext_spidfu_rescue_disability": "romext",
             "//sw/device/silicon_creator/rom_ext/e2e/attestation:print_certs": "firmware",
         },
-        changes_otp = True,
         params = "-p spi-dfu -t gpio -v +Ioa2",
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue {params} --action=disability
         """,
@@ -700,7 +671,6 @@ opentitan_test(
         rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_dice_x509_slot_a",
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             --exec="bootstrap --clear-uart=true {rom_ext}"
             # Trigger rescue and make sure we can get the device ID.
@@ -728,7 +698,6 @@ opentitan_test(
         },
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             --exec="bootstrap --clear-uart=true {firmware}"
             --exec="console --non-interactive --exit-success='warning: rescue' --exit-failure='{exit_failure}'"
@@ -756,7 +725,6 @@ opentitan_test(
         },
         params = "-p spi-dfu -t gpio -v +Ioa2",
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue {params} --action=disability
         """,
@@ -777,7 +745,6 @@ opentitan_test(
             ":boot_test_slot_a": "firmware",
         },
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         """,
         test_harness = "//sw/host/tests/rescue:xmodem_rescue_error_handling",
@@ -798,7 +765,6 @@ opentitan_test(
         },
         params = "-p spi-dfu -t gpio -v +Ioa2",
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue {params} --action=spi-dfu-state-transitions
         """,
@@ -820,7 +786,6 @@ opentitan_test(
         },
         params = "-p spi-dfu -t gpio -v +Ioa2",
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue {params} --action=invalid-spi-dfu-requests
         """,
@@ -842,7 +807,6 @@ opentitan_test(
         },
         params = "-p spi-dfu -t gpio -v +Ioa2",
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue {params} --action=invalid-spi-flash-transaction
         """,
@@ -864,7 +828,6 @@ opentitan_test(
         },
         params = "-p usb-dfu -t strap -v 3",
         test_cmd = """
-        --clear-bitstream
         --bootstrap={firmware}
         rescue {params} --action=usb-dfu-out-chunk-too-big
         """,
@@ -884,12 +847,10 @@ opentitan_test(
         "//hw/top_earlgrey:fpga_cw340_rom_ext": None,
     },
     fpga = fpga_params(
-        changes_otp = True,
         exit_failure = "(FAIL|BFV:|mode: RESQ).*",
         rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_dice_x509_slot_a",
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             --exec="bootstrap --clear-uart=true {firmware}"
             --exec="console --non-interactive --exit-success='{exit_success}' --exit-failure='{exit_failure}'"
@@ -917,12 +878,10 @@ opentitan_test(
         "//hw/top_earlgrey:fpga_cw340_rom_ext": None,
     },
     fpga = fpga_params(
-        changes_otp = True,
         exit_success = "mode: RESQ",
         rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_xmodem_enter_on_watchdog",
         test_cmd = """
             --exec="transport init"
-            --exec="fpga clear-bitstream"
             --exec="fpga load-bitstream {bitstream}"
             --exec="bootstrap --clear-uart=true {firmware}"
             --exec="console --non-interactive --exit-success='{exit_success}' --exit-failure='{exit_failure}'"