[FiSim] Cherry-pick fixes

Cherry-pick fixes for the eg100 branch for the FiSIm framework from master.

Signed-off-by: Siemen Dhooghe <sdhooghe@google.com>

Author: siemen11

sw/device/tests/penetrationtests/firmware/testdata/BUILD

@@ -53,7 +53,7 @@ offline_presigning_artifacts(
     name = "non_signed_firmware",
     testonly = True,
     srcs = [":bl0_firmware"],
-    ecdsa_key = {"//sw/device/silicon_creator/lib/ownership/keys/fake:app_prod_ecdsa": "prod_key_0"},
+    ecdsa_key = {"//hw/ip/otp_ctrl/data/earlgrey_skus/sival/keys:keyset": "sv00-earlgrey-a1-root-ecdsa-prod-0"},
     manifest = "//sw/device/silicon_owner:manifest",
     spx_key = {},
     tags = ["manual"],
@@ -111,7 +111,7 @@ otp_json(
 
 otp_image(
     name = "otp_img_rom_ext_fi",
-    src = "//hw/top_earlgrey/data/otp:otp_json_rma",
+    src = "//hw/ip/otp_ctrl/data:otp_json_rma",
     overlays = STD_OTP_OVERLAYS + [
         ":otp_json_rom_ext_fi",
     ],
@@ -149,7 +149,7 @@ otp_json(
 
 otp_image(
     name = "otp_img_rom_rollback_fi",
-    src = "//hw/top_earlgrey/data/otp:otp_json_rma",
+    src = "//hw/ip/otp_ctrl/data:otp_json_rma",
     overlays = STD_OTP_OVERLAYS + [
         ":otp_json_rom_rollback_fi",
     ],
@@ -187,7 +187,7 @@ otp_json(
 
 otp_image(
     name = "otp_img_rom_ext_rollback_fi",
-    src = "//hw/top_earlgrey/data/otp:otp_json_rma",
+    src = "//hw/ip/otp_ctrl/data:otp_json_rma",
     overlays = STD_OTP_OVERLAYS + [
         ":otp_json_rom_ext_rollback_fi",
     ],

sw/host/penetrationtests/python/fi/gdb_testing/fi_rom_ext_python_gdb_test.py

@@ -293,9 +293,9 @@ def test_rom_ext_secure_boot(self):
     # Get the rom_ext path.
     rom_ext_path = r.Rlocation("lowrisc_opentitan/" + ROM_EXT)
     # Get the disassembly path.
-    rom_ext_dis_path = rom_ext_path.replace(".prod_key_0.signed.bin", ".dis")
+    rom_ext_dis_path = rom_ext_path.replace(".prod_key_0.prod_key_0.signed.bin", ".dis")
     # And the path for the elf.
-    rom_ext_elf_path = rom_ext_path.replace(".prod_key_0.signed.bin", ".elf")
+    rom_ext_elf_path = rom_ext_path.replace(".prod_key_0.prod_key_0.signed.bin", ".elf")
 
     if "fpga" in BOOTSTRAP:
         target_type = "fpga"

sw/host/penetrationtests/python/fi/gdb_testing/fi_rom_ext_rollback_python_gdb_test.py

@@ -291,9 +291,9 @@ def test_rom_ext_rollback(self):
     # Get the rom_ext path.
     rom_ext_path = r.Rlocation("lowrisc_opentitan/" + ROM_EXT)
     # Get the disassembly path.
-    rom_ext_dis_path = rom_ext_path.replace(".prod_key_0.signed.bin", ".dis")
+    rom_ext_dis_path = rom_ext_path.replace(".prod_key_0.prod_key_0.signed.bin", ".dis")
     # And the path for the elf.
-    rom_ext_elf_path = rom_ext_path.replace(".prod_key_0.signed.bin", ".elf")
+    rom_ext_elf_path = rom_ext_path.replace(".prod_key_0.prod_key_0.signed.bin", ".elf")
 
     if "fpga" in BOOTSTRAP:
         target_type = "fpga"

sw/host/penetrationtests/python/fi/gdb_testing/fi_rom_python_gdb_test.py

@@ -84,8 +84,7 @@ def test_rom_secure_boot(self):
         print("Starting the rom secure boot test")
 
         # Directory for the trace log files
-        pc_trace_file_1 = os.path.join(log_dir, "rom_secure_boot_pc_trace_1.log")
-        pc_trace_file_2 = os.path.join(log_dir, "rom_secure_boot_pc_trace_2.log")
+        pc_trace_file = os.path.join(log_dir, "rom_secure_boot_pc_trace.log")
         # Directory for the the log of the campaign
         campaign_file = os.path.join(log_dir, "rom_secure_boot_test_campaign.log")
 
@@ -112,8 +111,6 @@ def test_rom_secure_boot(self):
                 gdb.reset_target()
                 gdb.send_command(f"set $pc={jump_address}")
 
-                # Tracing in done in two steps to jump over sc_otbn_cmd_run which makes GDB hang
-
                 # Functions where we can get GDB to jump over
                 upsert_register_address = rom_parser.get_function_start_address("upsert_register")
 
@@ -123,74 +120,16 @@ def test_rom_secure_boot(self):
                     "sigverify_ecdsa_p256_key_id_get"
                 )
 
-                # We stop tracing when we execute the p256 verify in the otbn
-                trace_end_address = rom_parser.get_function_start_address("sc_otbn_cmd_run")
-
-                print(
-                    "Start and stop addresses for the rom for trace 1: ",
-                    trace_start_address,
-                    trace_end_address,
-                    flush=True,
-                )
-                print("First trace data is logged in ", pc_trace_file_1, flush=True)
-
-                # Start the tracing
-                # We set a short timeout to detect whether GDB has connected properly
-                # and a long timeout for the entire tracing
-                initial_timeout = 20
-                total_timeout = 60 * 60 * 5
-
-                gdb.setup_pc_trace(
-                    pc_trace_file_1,
-                    trace_start_address,
-                    trace_end_address,
-                    skip_addrs=[upsert_register_address],
-                )
-                gdb.send_command("c", check_response=False)
-
-                start_time = time.time()
-                initial_timeout_stopped = False
-                total_timeout_stopped = False
-
-                # Run the tracing to get the trace log
-                # Sometimes the tracing fails due to race conditions,
-                # we have a quick initial timeout to catch this
-                while time.time() - start_time < initial_timeout:
-                    output = gdb.read_output()
-                    if "breakpoint 1, " in output:
-                        initial_timeout_stopped = True
-                        break
-                if not initial_timeout_stopped:
-                    print("No initial break point found, can be a misfire, try again")
-                    sys.exit(1)
-                while time.time() - start_time < total_timeout:
-                    output = gdb.read_output()
-                    if "PC trace complete" in output:
-                        print("\nTrace complete")
-                        total_timeout_stopped = True
-                        break
-                if not total_timeout_stopped:
-                    print("Final tracing timeout reached")
-                    sys.exit(1)
-
-                # Reset the target, flush the output, and close gdb
-                gdb = reset_target_and_gdb(gdb, jump_address)
-
-                # We ready the second part of the trace
-
-                # We start from sc_otbn_dmem_read which reads p256 verify's results from otbn
-                trace_start_address = rom_parser.get_function_start_address("sc_otbn_dmem_read")
-
                 # We expect with the test that we end up in shutdown_finalize
                 trace_end_address = rom_parser.get_function_start_address("shutdown_finalize")
 
                 print(
-                    "Start and stop addresses for the rom for trace 2: ",
+                    "Start and stop addresses for the rom: ",
                     trace_start_address,
                     trace_end_address,
                     flush=True,
                 )
-                print("Second trace data is logged in ", pc_trace_file_2, flush=True)
+                print("Trace data is logged in ", pc_trace_file, flush=True)
 
                 # Start the tracing
                 # We set a short timeout to detect whether GDB has connected properly
@@ -199,7 +138,7 @@ def test_rom_secure_boot(self):
                 total_timeout = 60 * 60 * 5
 
                 gdb.setup_pc_trace(
-                    pc_trace_file_2,
+                    pc_trace_file,
                     trace_start_address,
                     trace_end_address,
                     skip_addrs=[upsert_register_address],
@@ -232,8 +171,7 @@ def test_rom_secure_boot(self):
                     sys.exit(1)
 
                 # Parse and truncate the trace log to get all PCs in a list
-                pc_list = gdb.parse_pc_trace_file(pc_trace_file_1)
-                pc_list.extend(gdb.parse_pc_trace_file(pc_trace_file_2))
+                pc_list = gdb.parse_pc_trace_file(pc_trace_file)
                 # Get the unique PCs and annotate their occurence count
                 pc_count_dict = Counter(pc_list)
                 if len(pc_count_dict) <= 0:

sw/host/penetrationtests/python/fi/gdb_testing/fi_rom_rollback_python_gdb_test.py

@@ -114,9 +114,9 @@ def test_rom_rollback(self):
                 # Functions where we can get GDB to jump over
                 upsert_register_address = rom_parser.get_function_start_address("upsert_register")
 
-                # We perform the tracing over the rom_start function
+                # We perform the tracing over the rom_main function
                 trace_start_address = rom_parser.get_function_start_address(
-                    "rom_state_boot_rom_ext"
+                    "rom_main"
                 )
                 # We expect with the test that we end up in shutdown
                 trace_end_address = rom_parser.get_function_start_address("shutdown_finalize")