Skip to content

Commit 0ed70be

Browse files
clayton8Copilotcalebofearthekarabu
authored and
martin-velay
committed
[RTL] Integrate OCP LOCK from caliptra-rtl (#638)
* [RTL] Add FIPS zeroization sampling for MCU ROM 2.1 (#549) * [RTL] Add FIPS zeroization sampling for MCU ROM #474 * Update CaliptraSSIntegrationSpecification.md * Update src/mci/rtl/mci_reg.rdl Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-fips-zeroiz-2.1' with updated timestamp and hash after successful run --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * [DOC/RTL] Add AES DMA Spec and DMA AES from Caliptra-RTL - 2.1 (#557) * Add AES to AXI DMA Diagram * Add AXI DMA AES diagram * Initial AES DMA spec * Add AES Mode to programming flowchart for DMA * Fix pointer to DMA image * Add AES mode to configuration * Add AES AXI access restrictions * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Caleb <11879229+calebofearth@users.noreply.github.com> * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Caleb <11879229+calebofearth@users.noreply.github.com> * [Spec] AES DMA mention GCM mode and DWORD alignment requirement * [DOC] Update AXI DMA images with AES connection * [DOC] Mention DMA AES endianness * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update docs/CaliptraSSHardwareSpecification.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update endian capabilities for AES DMA * Update caliptra-rtl pointer which has AES DMA * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-axi-dma-aes-spec-2.1' with updated timestamp and hash after successful run * Add AES spec link * Update DMA images --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Caleb <11879229+calebofearth@users.noreply.github.com> * updated soc header file with caliptra-rtl * integrated caliptra-rtl into caliptra-ss * mimicked the ROM * updated caliptra-rtl version * new soc_header file location * resolved the reg file issue * updated old caliptra isr files with caliptra 2.0 needs * adjusted makefile and yml file for new reg file locat * fixed abr lint connection error * [TB/RTL] Integrate OCP LOCK caliptra-rtl - Port new OCP lock straps to SS top level - Rename kmac to kmac_ss to avoid conflict with SHA3 files in caliptra-rtl - Add sha3 to compilespecs.yml * [TB] Fix build errors due to clashing between xorshift32 functions in SS and RTL C libs * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-promote-ocp-lock-caliptra-rtl' with updated timestamp and hash after successful run * [DOC] Add OCP LOCK input signals to integ spec * Update caliptra-rtl to latest commit * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-promote-ocp-lock-caliptra-rtl' with updated timestamp and hash after successful run * Update caliptra-rtl to main branch with OCP LOCK * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-promote-ocp-lock-caliptra-rtl' with updated timestamp and hash after successful run * [TB] Update RDL collateral * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-promote-ocp-lock-caliptra-rtl' with updated timestamp and hash after successful run * [TB] revert some caliptra_isr.h changes * More calitpra_isr.h fixes * More calitpra_isr.h fixes * Update docs/CaliptraSSIntegrationSpecification.md Co-authored-by: Caleb <11879229+calebofearth@users.noreply.github.com> * Update smoke_test_jtag_prod_dbg.tcl * PR feedback * Add error out command to YML file * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-promote-ocp-lock-caliptra-rtl' with updated timestamp and hash after successful run * More caliptra_irs.h fixes * MICROSOFT AUTOMATED PIPELINE: Stamp 'ckuchta-promote-ocp-lock-caliptra-rtl' with updated timestamp and hash after successful run --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Caleb <11879229+calebofearth@users.noreply.github.com> Co-authored-by: Emre Karabulut <emre.karabulut.dde@gmail.com>
1 parent 269486f commit 0ed70be

File tree

110 files changed

+871
-694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+871
-694
lines changed

‎.github/workflow_metadata/pr_hash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6f53f3666bc76e0fa0332a9b43ad489b3d9b84e20d5b7a4e4d100a2ebeaa4a0dd7f278a183f1561d56d8db4f18aa89b5
1+
574a735cf65ff51ece060808ab7441b72ead1b14e694952eff81517d64532e0a8516e4249f546a02cbb4933edfc93d3e

‎.github/workflow_metadata/pr_timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1755057607
1+
1755646446

‎config/compilespecs.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ files:
2020
- third_party/caliptra-rtl/src/riscv_core/veer_el2/config/compile.yml
2121
- third_party/caliptra-rtl/src/sha512/config/compile.yml
2222
- third_party/caliptra-rtl/src/sha256/config/compile.yml
23+
- third_party/caliptra-rtl/src/sha3/config/compile.yml
2324
- third_party/caliptra-rtl/src/doe/config/compile.yml
2425
- third_party/caliptra-rtl/src/hmac/config/compile.yml
2526
- third_party/caliptra-rtl/src/soc_ifc/config/compile.yml
@@ -51,7 +52,10 @@ files:
5152
- third_party/caliptra-rtl/submodules/adams-bridge/src/rej_bounded/config/compile.yml
5253
- third_party/caliptra-rtl/submodules/adams-bridge/src/exp_mask/config/compile.yml
5354
- third_party/caliptra-rtl/submodules/adams-bridge/src/sample_in_ball/config/compile.yml
55+
- third_party/caliptra-rtl/submodules/adams-bridge/src/cbd_sampler/config/compile.yml
5456
- third_party/caliptra-rtl/submodules/adams-bridge/src/decompose/config/compile.yml
57+
- third_party/caliptra-rtl/submodules/adams-bridge/src/compress/config/compile.yml
58+
- third_party/caliptra-rtl/submodules/adams-bridge/src/decompress/config/compile.yml
5559
- third_party/caliptra-rtl/submodules/adams-bridge/src/sk_encode/config/compile.yml
5660
- third_party/caliptra-rtl/submodules/adams-bridge/src/sk_decode/config/compile.yml
5761
- third_party/caliptra-rtl/submodules/adams-bridge/src/makehint/config/compile.yml
@@ -61,11 +65,12 @@ files:
6165
- third_party/caliptra-rtl/submodules/adams-bridge/src/sigdecode_h/config/compile.yml
6266
- third_party/caliptra-rtl/submodules/adams-bridge/src/pk_decode/config/compile.yml
6367
- third_party/caliptra-rtl/submodules/adams-bridge/src/power2round/config/compile.yml
64-
- third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_sampler_top/config/compile.yml
68+
- third_party/caliptra-rtl/submodules/adams-bridge/src/abr_sampler_top/config/compile.yml
6569
- third_party/caliptra-rtl/submodules/adams-bridge/src/ntt_top/config/compile.yml
66-
- third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_top/config/compile.yml
70+
- third_party/caliptra-rtl/submodules/adams-bridge/src/barrett_reduction/config/compile.yml
71+
- third_party/caliptra-rtl/submodules/adams-bridge/src/abr_top/config/compile.yml
6772
# UVMF TBs
68-
- third_party/caliptra-rtl/submodules/adams-bridge/src/mldsa_top/uvmf/config/compile.yml
73+
- third_party/caliptra-rtl/submodules/adams-bridge/src/abr_top/uvmf/config/compile.yml
6974

7075
# UVMF TBs
7176
# - third_party/caliptra-rtl/src/aes_secworks/uvmf_cbc_AllKAT/config/compile.yml

‎docs/CaliptraSSIntegrationSpecification.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ File at this path in the repository includes parameters and defines for Caliptra
282282
| External | input | 32 | `cptra_ss_strap_generic_2_i` | Generic strap input 2 |
283283
| External | input | 32 | `cptra_ss_strap_generic_3_i` | Generic strap input 3 |
284284
| 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|
285+
| External | input | 16 | `cptra_ss_strap_key_release_key_size_i` | OCP L.O.C.K. MEK byte size. Expected to be 0x40. |
286+
| External | input | 64 | `cptra_ss_strap_key_release_base_addr_i` | OCP L.O.C.K. MEK release base address. |
287+
| 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 hardware features specific to OCP L.O.C.K. such as AES Keyvault write path, Keyvault filtering rules, and Key Release via AXI DMA. |
285288

286289
### AXI Interface (axi_if)
287290

‎src/fuse_ctrl/coverage/fuse_ctrl_cov_if.sv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ interface fuse_ctrl_cov_if
3737

3838
logic [31:0] core_axi_wr_req_awaddr;
3939
logic [31:0] core_axi_wr_req_awuser;
40-
assign core_axi_wr_req_awaddr = fuse_ctrl_filter.core_axi_wr_req.awaddr;
41-
assign core_axi_wr_req_awuser = fuse_ctrl_filter.core_axi_wr_req.awuser;
40+
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;
41+
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;
4242

4343
covergroup fuse_ctrl_filter_cg @(posedge clk_i);
4444
option.per_instance = 1;

‎src/integration/config/caliptra_ss_top.vf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_reg_pkg.sv
232232
${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_pkg.sv
233233
${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_part_pkg.sv
234234
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_keymgr_pkg.sv
235-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_pkg.sv
235+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_pkg.sv
236236
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3_pkg.sv
237-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_pkg.sv
237+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_pkg.sv
238238
${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_pkg.sv
239239
${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_if.sv
240240
${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_addr.v
@@ -306,14 +306,14 @@ ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_2share.sv
306306
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_round.sv
307307
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3pad.sv
308308
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3.sv
309-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_app.sv
310-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_core.sv
311-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_entropy.sv
312-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_errchk.sv
313-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_msgfifo.sv
314-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_top.sv
315-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_staterd.sv
316-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac.sv
309+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_app.sv
310+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_core.sv
311+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_entropy.sv
312+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_errchk.sv
313+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_msgfifo.sv
314+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_top.sv
315+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_staterd.sv
316+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss.sv
317317
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_fsm.sv
318318
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_kmac_if.sv
319319
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_top.sv

‎src/integration/config/caliptra_ss_top_tb.vf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -708,9 +708,9 @@ ${CALIPTRA_SS_ROOT}/src/tlul/rtl/tlul_pkg.sv
708708
${CALIPTRA_SS_ROOT}/src/tlul/rtl/tlul_assert_multiple.sv
709709
${CALIPTRA_SS_ROOT}/src/tlul/rtl/tlul_assert.sv
710710
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_keymgr_pkg.sv
711-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_pkg.sv
711+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_pkg.sv
712712
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3_pkg.sv
713-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_pkg.sv
713+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_pkg.sv
714714
${CALIPTRA_SS_ROOT}/src/axi2tlul/rtl/axi2tlul_cmd_intg_gen.sv
715715
${CALIPTRA_SS_ROOT}/src/axi2tlul/rtl/sub2tlul.sv
716716
${CALIPTRA_SS_ROOT}/src/axi2tlul/rtl/axi2tlul.sv
@@ -739,14 +739,14 @@ ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_2share.sv
739739
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_round.sv
740740
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3pad.sv
741741
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3.sv
742-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_app.sv
743-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_core.sv
744-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_entropy.sv
745-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_errchk.sv
746-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_msgfifo.sv
747-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_top.sv
748-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_staterd.sv
749-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac.sv
742+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_app.sv
743+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_core.sv
744+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_entropy.sv
745+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_errchk.sv
746+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_msgfifo.sv
747+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_top.sv
748+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_staterd.sv
749+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss.sv
750750
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_fsm.sv
751751
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_kmac_if.sv
752752
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_top.sv

‎src/integration/config/caliptra_ss_top_w_stub.vf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ ${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_reg_pkg.sv
232232
${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_pkg.sv
233233
${CALIPTRA_SS_ROOT}/src/fuse_ctrl/rtl/otp_ctrl_part_pkg.sv
234234
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_keymgr_pkg.sv
235-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_pkg.sv
235+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_pkg.sv
236236
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3_pkg.sv
237-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_pkg.sv
237+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_pkg.sv
238238
${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_pkg.sv
239239
${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_if.sv
240240
${CALIPTRA_SS_ROOT}/third_party/caliptra-rtl/src/axi/rtl/axi_addr.v
@@ -306,14 +306,14 @@ ${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_2share.sv
306306
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_keccak_round.sv
307307
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3pad.sv
308308
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/caliptra_ss_sha3.sv
309-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_app.sv
310-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_core.sv
311-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_entropy.sv
312-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_errchk.sv
313-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_msgfifo.sv
314-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_reg_top.sv
315-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_staterd.sv
316-
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac.sv
309+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_app.sv
310+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_core.sv
311+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_entropy.sv
312+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_errchk.sv
313+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_msgfifo.sv
314+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_reg_top.sv
315+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss_staterd.sv
316+
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/kmac_ss.sv
317317
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_fsm.sv
318318
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_kmac_if.sv
319319
${CALIPTRA_SS_ROOT}/src/lc_ctrl/rtl/lc_ctrl_reg_top.sv

‎src/integration/config/compile.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,18 @@ provides: [caliptra_ss_top_defines]
5656
schema_version: 2.4.0
5757
targets:
5858
tb:
59-
directories: [$COMPILE_ROOT/rtl]
59+
directories:
60+
- $COMPILE_ROOT/rtl
61+
- $COMPILE_ROOT/rtl/soc_address_map
6062
files:
6163
- $COMPILE_ROOT/testbench/caliptra_ss_top_tb_path_defines.svh
62-
- $COMPILE_ROOT/rtl/soc_address_map_defines.svh
64+
- $COMPILE_ROOT/rtl/soc_address_map/soc_address_map_defines.svh
6365
- $COMPILE_ROOT/rtl/caliptra_ss_includes.svh
6466
rtl:
6567
directories: [$COMPILE_ROOT/rtl]
6668
files:
6769
- $COMPILE_ROOT/testbench/caliptra_ss_top_tb_path_defines.svh
68-
- $COMPILE_ROOT/rtl/soc_address_map_defines.svh
70+
- $COMPILE_ROOT/rtl/soc_address_map/soc_address_map_defines.svh
6971
- $COMPILE_ROOT/rtl/caliptra_ss_includes.svh
7072
---
7173
provides: [caliptra_ss_top]
@@ -179,10 +181,12 @@ targets:
179181
&& echo "[PRE-EXEC] Copying DOE vector generator to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/doe/tb/doe_test_gen.py .
180182
&& 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 .
181183
&& echo "[PRE-EXEC] Copying SHA512 Vectors to $(pwd)" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/integration/tb/vectors/SHA*.rsp .
182-
&& 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 .
183-
&& 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 .
184+
&& 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 .
185+
&& 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 .
184186
&& echo "[PRE-EXEC] Copying mldsa directed vector to ${pwd}" && cp $COMPILE_ROOT/../../third_party/caliptra-rtl/src/mldsa/tb/smoke_test_mldsa_vector.hex .
185-
&& echo "[PRE-EXEC] Copying otp-img.2048.vmem to ${pwd}" && cp $COMPILE_ROOT/../../src/fuse_ctrl/data/otp-img.2048.vmem .'
187+
&& echo "[PRE-EXEC] Copying otp-img.2048.vmem to ${pwd}" && cp $COMPILE_ROOT/../../src/fuse_ctrl/data/otp-img.2048.vmem .
188+
&& echo "[PRE-EXEC] Copying MLKEM vector generator to $pwd" && cp -r $MSFT_SCRIPTS_DIR/models/ml-kem . && mkdir ml-kem/tv'
189+
post_exec: 'rm -r ./ml-kem && if [[ -f ./cm.log ]]; then rm ./cm.log; else echo "Did not find cm.log"; fi'
186190
global:
187191
tool:
188192
vcs:

‎src/integration/rtl/caliptra_ss_top.sv‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ module caliptra_ss_top
140140
// Caliptra Memory Export Interface
141141
// Caliptra Core, ICCM and DCCM interface
142142
el2_mem_if.veer_sram_src cptra_ss_cptra_core_el2_mem_export,
143-
mldsa_mem_if.req mldsa_memory_export_req,
143+
abr_mem_if.req abr_memory_export_req,
144144

145145
// SRAM interface for mbox
146146
// Caliptra SS mailbox sram interface
@@ -211,11 +211,15 @@ module caliptra_ss_top
211211
input logic [63:0] cptra_ss_strap_caliptra_base_addr_i,
212212
input logic [63:0] cptra_ss_strap_mci_base_addr_i,
213213
input logic [63:0] cptra_ss_strap_recovery_ifc_base_addr_i,
214+
input logic [63:0] cptra_ss_strap_external_staging_area_base_addr_i,
214215
input logic [63:0] cptra_ss_strap_otp_fc_base_addr_i,
215216
input logic [63:0] cptra_ss_strap_uds_seed_base_addr_i,
216217
input logic [31:0] cptra_ss_strap_prod_debug_unlock_auth_pk_hash_reg_bank_offset_i,
217218
input logic [31:0] cptra_ss_strap_num_of_prod_debug_unlock_auth_pk_hashes_i,
218219
input logic [31:0] cptra_ss_strap_caliptra_dma_axi_user_i,
220+
input logic [15:0] cptra_ss_strap_key_release_key_size_i,
221+
input logic [63:0] cptra_ss_strap_key_release_base_addr_i,
222+
input logic cptra_ss_strap_ocp_lock_en_i,
219223
input logic [31:0] cptra_ss_strap_generic_0_i,
220224
input logic [31:0] cptra_ss_strap_generic_1_i,
221225
input logic [31:0] cptra_ss_strap_generic_2_i,
@@ -473,7 +477,7 @@ module caliptra_ss_top
473477
.m_axi_r_if(cptra_ss_cptra_core_m_axi_if_r_mgr),
474478

475479
.el2_mem_export(cptra_ss_cptra_core_el2_mem_export),
476-
.mldsa_memory_export(mldsa_memory_export_req),
480+
.abr_memory_export(abr_memory_export_req),
477481

478482
.ready_for_fuses(), // -- unused in caliptra ss
479483
.ready_for_mb_processing(), // -- unused in caliptra ss
@@ -514,11 +518,15 @@ module caliptra_ss_top
514518
.strap_ss_caliptra_base_addr ( cptra_ss_strap_caliptra_base_addr_i ),
515519
.strap_ss_mci_base_addr ( cptra_ss_strap_mci_base_addr_i ),
516520
.strap_ss_recovery_ifc_base_addr ( cptra_ss_strap_recovery_ifc_base_addr_i ),
521+
.strap_ss_external_staging_area_base_addr ( cptra_ss_strap_external_staging_area_base_addr_i ),
517522
.strap_ss_otp_fc_base_addr ( cptra_ss_strap_otp_fc_base_addr_i ),
518523
.strap_ss_uds_seed_base_addr ( cptra_ss_strap_uds_seed_base_addr_i ),
519524
.strap_ss_prod_debug_unlock_auth_pk_hash_reg_bank_offset( cptra_ss_strap_prod_debug_unlock_auth_pk_hash_reg_bank_offset_i ),
520525
.strap_ss_num_of_prod_debug_unlock_auth_pk_hashes ( cptra_ss_strap_num_of_prod_debug_unlock_auth_pk_hashes_i ),
521-
.strap_ss_caliptra_dma_axi_user ( cptra_ss_strap_caliptra_dma_axi_user_i),
526+
.strap_ss_caliptra_dma_axi_user ( cptra_ss_strap_caliptra_dma_axi_user_i ),
527+
.strap_ss_key_release_key_size ( cptra_ss_strap_key_release_key_size_i ),
528+
.strap_ss_key_release_base_addr ( cptra_ss_strap_key_release_base_addr_i ),
529+
.ss_ocp_lock_en ( cptra_ss_strap_ocp_lock_en_i ),
522530
.strap_ss_strap_generic_0 ( cptra_ss_strap_generic_0_i ),
523531
.strap_ss_strap_generic_1 ( cptra_ss_strap_generic_1_i ),
524532
.strap_ss_strap_generic_2 ( cptra_ss_strap_generic_2_i ),

0 commit comments

Comments
 (0)