[RTL] Integrate OCP LOCK from caliptra-rtl

.github/workflow_metadata/pr_hash

@@ -1 +1 @@
-6f53f3666bc76e0fa0332a9b43ad489b3d9b84e20d5b7a4e4d100a2ebeaa4a0dd7f278a183f1561d56d8db4f18aa89b5
+14da13ad4e289cbe151267e28d09602a82c104742aa9b3e8770e93dd012be383dde4ef537bdfe929231ccc89a35d58df

.github/workflow_metadata/pr_timestamp

@@ -1 +1 @@
-1755057607
+1755622492

config/compilespecs.yml

@@ -20,6 +20,7 @@ files:
   - third_party/caliptra-rtl/src/riscv_core/veer_el2/config/compile.yml
   - third_party/caliptra-rtl/src/sha512/config/compile.yml
   - third_party/caliptra-rtl/src/sha256/config/compile.yml
+  - third_party/caliptra-rtl/src/sha3/config/compile.yml
   - third_party/caliptra-rtl/src/doe/config/compile.yml
   - third_party/caliptra-rtl/src/hmac/config/compile.yml
   - third_party/caliptra-rtl/src/soc_ifc/config/compile.yml
@@ -51,7 +52,10 @@ files:
   - third_party/caliptra-rtl/submodules/adams-bridge/src/rej_bounded/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/exp_mask/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/sample_in_ball/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/cbd_sampler/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/decompose/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/compress/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/decompress/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/sk_encode/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/sk_decode/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/makehint/config/compile.yml
@@ -61,11 +65,12 @@ files:
   - third_party/caliptra-rtl/submodules/adams-bridge/src/sigdecode_h/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/pk_decode/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/power2round/config/compile.yml
-  - third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_sampler_top/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/abr_sampler_top/config/compile.yml
   - third_party/caliptra-rtl/submodules/adams-bridge/src/ntt_top/config/compile.yml
-  - third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_top/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/barrett_reduction/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/abr_top/config/compile.yml
   # UVMF TBs
-  - third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_top/uvmf/config/compile.yml
+  - third_party/caliptra-rtl/submodules/adams-bridge/src/abr_top/uvmf/config/compile.yml
 
   # UVMF TBs
 # - third_party/caliptra-rtl/src/aes_secworks/uvmf_cbc_AllKAT/config/compile.yml

docs/CaliptraSSIntegrationSpecification.md

@@ -282,6 +282,9 @@ File at this path in the repository includes parameters and defines for Caliptra
 | External | input     | 32     | `cptra_ss_strap_generic_2_i`              | Generic strap input 2                    |
 | External | input     | 32     | `cptra_ss_strap_generic_3_i`              | Generic strap input 3                    |
 | External | input     | 1      | `cptra_ss_debug_intent_i`                 | Physical presence bit required to initiate the debug unlock flow. For more details, refer to the [Production Debug Unlock Flow](CaliptraSSHardwareSpecification.md#production-debug-unlock-architecture) and [How does Caliptra Subsystem enable manufacturing debug mode?](CaliptraSSHardwareSpecification.md#how-does-caliptra-subsystem-enable-manufacturing-debug-mode). For SOCs that choose to use these features, this port should be connected to a GPIO|
+| External | input     | 16     | `cptra_ss_strap_key_release_key_size_i`   | OCP L.O.C.K. MEK byte size. Expected to be 0x40.  |
+| External | input     | 64     | `cptra_ss_strap_key_release_base_addr_i`  | OCP L.O.C.K. MEK release base address.  |
+| External | input     | 1      | `cptra_ss_strap_ocp_lock_en_i             | OCP L.O.C.K. enable. Allows OCP L.O.C.K. in progress to be set enabling specific OCP L.O.C.K. HW like AES write ability to Keyvault.  |
 
 ### AXI Interface (axi_if)
 

src/fuse_ctrl/coverage/fuse_ctrl_cov_if.sv

@@ -37,8 +37,8 @@ interface fuse_ctrl_cov_if
 
     logic [31:0] core_axi_wr_req_awaddr;
     logic [31:0] core_axi_wr_req_awuser;
-    assign core_axi_wr_req_awaddr = fuse_ctrl_filter.core_axi_wr_req.awaddr;
-    assign core_axi_wr_req_awuser = fuse_ctrl_filter.core_axi_wr_req.awuser;
+    assign core_axi_wr_req_awaddr = caliptra_ss_top_tb.caliptra_ss_dut.u_otp_ctrl.u_fuse_ctrl_filter.core_axi_wr_req.awaddr;
+    assign core_axi_wr_req_awuser = caliptra_ss_top_tb.caliptra_ss_dut.u_otp_ctrl.u_fuse_ctrl_filter.core_axi_wr_req.awuser;
 
     covergroup fuse_ctrl_filter_cg @(posedge clk_i);
         option.per_instance = 1;

src/integration/config/caliptra_ss_top.vf

@@ -230,9 +230,9 @@ ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_reg_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_part_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_keymgr_pkg.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_pkg.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3_pkg.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_pkg.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_pkg.sv
 ${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_pkg.sv
 ${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_if.sv
 ${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_addr.v
@@ -304,14 +304,14 @@ ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_2share.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_round.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3pad.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_app.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_core.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_entropy.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_errchk.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_msgfifo.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_top.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_staterd.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_app.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_core.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_entropy.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_errchk.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_msgfifo.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_top.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_staterd.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_fsm.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_kmac_if.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_top.sv

src/integration/config/caliptra_ss_top_tb.vf

@@ -707,9 +707,9 @@ ${CALIPTRA_SS_ROOT}/src/tlul/rtl/tlul_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/tlul/rtl/tlul_assert_multiple.sv
 ${CALIPTRA_SS_ROOT}/src/tlul/rtl/tlul_assert.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_keymgr_pkg.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_pkg.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3_pkg.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_pkg.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/axi2tlul/rtl/axi2tlul_cmd_intg_gen.sv
 ${CALIPTRA_SS_ROOT}/src/axi2tlul/rtl/sub2tlul.sv
 ${CALIPTRA_SS_ROOT}/src/axi2tlul/rtl/axi2tlul.sv
@@ -738,14 +738,14 @@ ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_2share.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_round.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3pad.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_app.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_core.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_entropy.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_errchk.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_msgfifo.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_top.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_staterd.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_app.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_core.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_entropy.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_errchk.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_msgfifo.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_top.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_staterd.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_fsm.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_kmac_if.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_top.sv

src/integration/config/caliptra_ss_top_w_stub.vf

@@ -230,9 +230,9 @@ ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_reg_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_part_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_keymgr_pkg.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_pkg.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_pkg.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3_pkg.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_pkg.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_pkg.sv
 ${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_pkg.sv
 ${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_if.sv
 ${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_addr.v
@@ -304,14 +304,14 @@ ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_2share.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_round.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3pad.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_app.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_core.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_entropy.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_errchk.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_msgfifo.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_top.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_staterd.sv
-${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_app.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_core.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_entropy.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_errchk.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_msgfifo.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_top.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_staterd.sv
+${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_fsm.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_kmac_if.sv
 ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_top.sv

src/integration/config/compile.yml

@@ -56,16 +56,18 @@ provides: [caliptra_ss_top_defines]
 schema_version: 2.4.0
 targets:
   tb:
-    directories: [$COMPILE_ROOT/rtl]
+    directories:
+      - $COMPILE_ROOT/rtl
+      - $COMPILE_ROOT/rtl/soc_address_map
     files:
       - $COMPILE_ROOT/testbench/caliptra_ss_top_tb_path_defines.svh
-      - $COMPILE_ROOT/rtl/soc_address_map_defines.svh
+      - $COMPILE_ROOT/rtl/soc_address_map/soc_address_map_defines.svh
       - $COMPILE_ROOT/rtl/caliptra_ss_includes.svh
   rtl:
     directories: [$COMPILE_ROOT/rtl]
     files:
       - $COMPILE_ROOT/testbench/caliptra_ss_top_tb_path_defines.svh
-      - $COMPILE_ROOT/rtl/soc_address_map_defines.svh
+      - $COMPILE_ROOT/rtl/soc_address_map/soc_address_map_defines.svh
       - $COMPILE_ROOT/rtl/caliptra_ss_includes.svh
 ---
 provides: [caliptra_ss_top]
@@ -167,10 +169,12 @@ targets:
                 && echo "[PRE-EXEC] Copying DOE vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/doe/tb/doe_test_gen.py .
                 && echo "[PRE-EXEC] Copying SHA256 wntz vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/sha256/tb/sha256_wntz_test_gen.py .
                 && echo "[PRE-EXEC] Copying SHA512 Vectors to $(pwd)" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/integration/tb/vectors/SHA*.rsp .
-                && echo "[PRE-EXEC] Copying MLDSA vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5 .
-                && echo "[PRE-EXEC] Copying MLDSA debug vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5_debug .
+                && echo "[PRE-EXEC] Copying MLDSA vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/submodules/adams-bridge/src/abr_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5 .
+                && echo "[PRE-EXEC] Copying MLDSA debug vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/submodules/adams-bridge/src/abr_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5_debug .
                 && echo "[PRE-EXEC] Copying mldsa directed vector to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/mldsa/tb/smoke_test_mldsa_vector.hex .
-                && echo "[PRE-EXEC] Copying otp-img.2048.vmem to ${pwd}" && cp $COMPILE_ROOT/../../src/fuse_ctrl/data/otp-img.2048.vmem .'
+                && echo "[PRE-EXEC] Copying otp-img.2048.vmem to ${pwd}" && cp $COMPILE_ROOT/../../src/fuse_ctrl/data/otp-img.2048.vmem .
+                && echo "[PRE-EXEC] Copying MLKEM vector generator to $pwd" && cp -r $MSFT_SCRIPTS_DIR/models/ml-kem . && mkdir ml-kem/tv'
+    post_exec: 'rm -r ./ml-kem && if [[ -f ./cm.log ]]; then rm ./cm.log; else echo "Did not find cm.log"; fi'
 global:
   tool:
     vcs:

src/integration/rtl/caliptra_ss_top.sv

@@ -140,7 +140,7 @@ module caliptra_ss_top
 // Caliptra Memory Export Interface
 // Caliptra Core, ICCM and DCCM interface
     el2_mem_if.veer_sram_src           cptra_ss_cptra_core_el2_mem_export,
-    mldsa_mem_if.req                   mldsa_memory_export_req,
+    abr_mem_if.req                   abr_memory_export_req,
 
 // SRAM interface for mbox
 // Caliptra SS mailbox sram interface
@@ -211,11 +211,15 @@ module caliptra_ss_top
     input logic [63:0]  cptra_ss_strap_caliptra_base_addr_i,
     input logic [63:0]  cptra_ss_strap_mci_base_addr_i,
     input logic [63:0]  cptra_ss_strap_recovery_ifc_base_addr_i,
+    input logic [63:0]  cptra_ss_strap_external_staging_area_base_addr_i,
     input logic [63:0]  cptra_ss_strap_otp_fc_base_addr_i,
     input logic [63:0]  cptra_ss_strap_uds_seed_base_addr_i,
     input logic [31:0]  cptra_ss_strap_prod_debug_unlock_auth_pk_hash_reg_bank_offset_i,
     input logic [31:0]  cptra_ss_strap_num_of_prod_debug_unlock_auth_pk_hashes_i,
     input logic [31:0]  cptra_ss_strap_caliptra_dma_axi_user_i,
+    input logic [15:0]  cptra_ss_strap_key_release_key_size_i,
+    input logic [63:0]  cptra_ss_strap_key_release_base_addr_i,
+    input logic         cptra_ss_strap_ocp_lock_en_i,
     input logic [31:0]  cptra_ss_strap_generic_0_i,
     input logic [31:0]  cptra_ss_strap_generic_1_i,
     input logic [31:0]  cptra_ss_strap_generic_2_i,
@@ -473,7 +477,7 @@ module caliptra_ss_top
         .m_axi_r_if(cptra_ss_cptra_core_m_axi_if_r_mgr),
 
         .el2_mem_export(cptra_ss_cptra_core_el2_mem_export),
-        .mldsa_memory_export(mldsa_memory_export_req),
+        .abr_memory_export(abr_memory_export_req),
 
         .ready_for_fuses(),             // -- unused in caliptra ss
         .ready_for_mb_processing(),     // -- unused in caliptra ss
@@ -514,11 +518,15 @@ module caliptra_ss_top
         .strap_ss_caliptra_base_addr                            ( cptra_ss_strap_caliptra_base_addr_i ),
         .strap_ss_mci_base_addr                                 ( cptra_ss_strap_mci_base_addr_i ),
         .strap_ss_recovery_ifc_base_addr                        ( cptra_ss_strap_recovery_ifc_base_addr_i ),
+        .strap_ss_external_staging_area_base_addr               ( cptra_ss_strap_external_staging_area_base_addr_i ),
         .strap_ss_otp_fc_base_addr                              ( cptra_ss_strap_otp_fc_base_addr_i ),
         .strap_ss_uds_seed_base_addr                            ( cptra_ss_strap_uds_seed_base_addr_i ),
         .strap_ss_prod_debug_unlock_auth_pk_hash_reg_bank_offset( cptra_ss_strap_prod_debug_unlock_auth_pk_hash_reg_bank_offset_i ),
         .strap_ss_num_of_prod_debug_unlock_auth_pk_hashes       ( cptra_ss_strap_num_of_prod_debug_unlock_auth_pk_hashes_i ),
-        .strap_ss_caliptra_dma_axi_user                         ( cptra_ss_strap_caliptra_dma_axi_user_i),
+        .strap_ss_caliptra_dma_axi_user                         ( cptra_ss_strap_caliptra_dma_axi_user_i ),
+        .strap_ss_key_release_key_size                          ( cptra_ss_strap_key_release_key_size_i ),
+        .strap_ss_key_release_base_addr                         ( cptra_ss_strap_key_release_base_addr_i ),
+        .ss_ocp_lock_en                                         ( cptra_ss_strap_ocp_lock_en_i ),
         .strap_ss_strap_generic_0                               ( cptra_ss_strap_generic_0_i ),
         .strap_ss_strap_generic_1                               ( cptra_ss_strap_generic_1_i ),
         .strap_ss_strap_generic_2                               ( cptra_ss_strap_generic_2_i ),

src/integration/rtl/caliptra_ss_top_w_stub.sv

@@ -170,17 +170,17 @@ module caliptra_ss_top_w_stub(
     assign cptra_ss_cptra_core_el2_mem_export.iccm_bank_ecc = '0;
     assign cptra_ss_cptra_core_el2_mem_export.dccm_bank_dout = '0;
     assign cptra_ss_cptra_core_el2_mem_export.iccm_bank_dout = '0;
-    mldsa_mem_if mldsa_memory_export();
-    assign mldsa_memory_export.mem_inst0_bank0_rdata_o = '0;
-    assign mldsa_memory_export.mem_inst0_bank1_rdata_o = '0;
-    assign mldsa_memory_export.mem_inst1_rdata_o = '0;
-    assign mldsa_memory_export.mem_inst2_rdata_o = '0;
-    assign mldsa_memory_export.mem_inst3_rdata_o = '0;
-    assign mldsa_memory_export.sig_z_mem_rdata_o = '0;
-    assign mldsa_memory_export.pk_mem_rdata_o = '0;
-    assign mldsa_memory_export.sk_mem_bank0_rdata_o = '0;
-    assign mldsa_memory_export.sk_mem_bank1_rdata_o = '0;
-    assign mldsa_memory_export.w1_mem_rdata_o = '0;
+    abr_mem_if abr_memory_export();
+    assign abr_memory_export.mem_inst0_bank0_rdata_o = '0;
+    assign abr_memory_export.mem_inst0_bank1_rdata_o = '0;
+    assign abr_memory_export.mem_inst1_rdata_o = '0;
+    assign abr_memory_export.mem_inst2_rdata_o = '0;
+    assign abr_memory_export.mem_inst3_rdata_o = '0;
+    assign abr_memory_export.sig_z_mem_rdata_o = '0;
+    assign abr_memory_export.pk_mem_rdata_o = '0;
+    assign abr_memory_export.sk_mem_bank0_rdata_o = '0;
+    assign abr_memory_export.sk_mem_bank1_rdata_o = '0;
+    assign abr_memory_export.w1_mem_rdata_o = '0;
 
 
     logic cptra_ss_cptra_core_mbox_sram_cs_o;
@@ -472,7 +472,7 @@ module caliptra_ss_top_w_stub(
 
     // Caliptra Memory Export Interface
         .cptra_ss_cptra_core_el2_mem_export(cptra_ss_cptra_core_el2_mem_export),
-        .mldsa_memory_export_req(mldsa_memory_export.req),
+        .abr_memory_export_req(abr_memory_export.req),
 
     //SRAM interface for mbox
         .cptra_ss_cptra_core_mbox_sram_cs_o,
@@ -535,6 +535,7 @@ module caliptra_ss_top_w_stub(
         .cptra_ss_strap_caliptra_base_addr_i,
         .cptra_ss_strap_mci_base_addr_i,
         .cptra_ss_strap_recovery_ifc_base_addr_i,
+        .cptra_ss_strap_external_staging_area_base_addr_i('0),
         .cptra_ss_strap_otp_fc_base_addr_i,
         .cptra_ss_strap_uds_seed_base_addr_i,
         .cptra_ss_strap_prod_debug_unlock_auth_pk_hash_reg_bank_offset_i,
@@ -547,6 +548,9 @@ module caliptra_ss_top_w_stub(
         .cptra_ss_debug_intent_i,
         .cptra_ss_dbg_manuf_enable_o,
         .cptra_ss_cptra_core_soc_prod_dbg_unlock_level_o,
+        .cptra_ss_strap_key_release_key_size_i(16'h40),
+        .cptra_ss_strap_key_release_base_addr_i('0),
+        .cptra_ss_strap_ocp_lock_en_i(1'b1),
 
         .cptra_ss_lc_clk_byp_ack_i           (cptra_ss_lc_clk_byp_ack_i),
         .cptra_ss_lc_clk_byp_req_o           (cptra_ss_lc_clk_byp_req_o),