[RTL] AXI USER fixes and updates to mcu_cptra_bringup to execute FW UPD flow by calebofearth · Pull Request #150 · chipsalliance/caliptra-ss

calebofearth · 2025-03-19T05:42:59Z

Summary:

Fix user signals and config so design boots with Caliptra ROM
Unique AxUSER for Caliptra, MCU-LSU, and MCU-IFU
Initialize data/bss/STACK to DCCM, as the MCU SRAM is locked at startup

Squashed commit of the following:

commit 76b1cc55bf7823fe89de652ddf7817e8a5b496e8
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Tue Mar 18 15:54:41 2025 -0700

Add comment for issue tracking

commit b495d1b85041110537dbfbce37cae45e9bb196b4
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Tue Mar 18 10:30:51 2025 -0700

Re-enable the AXI User fixes

commit ad38b48
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Tue Mar 18 10:28:22 2025 -0700

Hello world testcase that shows caliptra-core fw built from caliptra-ss repo

commit 62479b4
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Tue Mar 18 10:19:36 2025 -0700

Whitespace

commit 69611c4
Merge: 5ba71c4 a2a3cec
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 16:45:18 2025 -0700

Merge remote-tracking branch 'chips/main' into cwhitehead-msft-local-testcode-PoC

commit 5ba71c4
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 15:38:07 2025 -0700

Update testfile yml for all smoke tests

commit 8ef4e6f
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 13:52:51 2025 -0700

Roll back the USER/linker modifications to isolate just the methodology changes

commit 3500540
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 13:27:06 2025 -0700

Move mcu bringup tasks to shared lib file; update Makefile to init data to DCCM and build libs

commit 60ee631
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 12:03:27 2025 -0700

Reorganize the libs area

commit d40b3c6
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 11:21:18 2025 -0700

Rename top test list file

commit e6ba3ee
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 11:19:59 2025 -0700

Makefile cleanup

commit 384ed48
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:46:26 2025 -0700

Revert changes to mcu_hello_world -- it's a defunct test

commit 8fcfd45
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:42:53 2025 -0700

Add explanatory note/TODO on LSU user

commit 2e98c2d
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:35:39 2025 -0700

Update RTL submodule to pull fw_test_rom updates

commit 9ee216d
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:32:40 2025 -0700

Remove cptra AxUSER force; TMP: set cptra AxUSER as SOC CONFIG user

commit 5ff6e31
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:29:50 2025 -0700

Initialize data/bss/STACK to DCCM, as the MCU SRAM is locked at startup

commit 7b7181b
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:29:13 2025 -0700

Fixes to get cptra_ss_i3c_recovery pre-exec working

commit 6edb48a
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:28:13 2025 -0700

Unique AxUSER for Caliptra, MCU-LSU, and MCU-IFU

commit 33324b2
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Mon Mar 17 10:27:30 2025 -0700

Regenerate RDL files and update workflow to catch out of date RDL

commit 4aeedfc
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Fri Mar 14 12:03:55 2025 -0700

Use DEBUG_OUT as STDOUT in ss sims

commit 691f2f9
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 13 15:28:01 2025 -0700

Fix user signals and config so design boots with Caliptra ROM

commit 37b630c
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 13 14:57:22 2025 -0700

Add caliptra subsystem macro to compile.yml; update test-suites with plusargs/pre_exec

commit 41b423f
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 13 13:25:37 2025 -0700

Remove recipe for program.hex

commit eba6fd6
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 13 12:39:09 2025 -0700

Add a top-level include file that grabs all css ai3c tests

commit 6057cd3
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 13 12:38:42 2025 -0700

Rename ai3ct test as svh, since it's an include

commit a5a3651
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 13 12:36:59 2025 -0700

Reorganize ai3c tests

commit e058463
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 6 18:04:07 2025 -0800

Ending quote - syntax

commit 052f1e0
Author: Caleb Whitehead cwhitehead@microsoft.com
Date: Thu Mar 6 17:56:02 2025 -0800

Initial test code for bringup with local caliptra-core images

Summary: * Fix user signals and config so design boots with Caliptra ROM * Unique AxUSER for Caliptra, MCU-LSU, and MCU-IFU * Initialize data/bss/STACK to DCCM, as the MCU SRAM is locked at startup Squashed commit of the following: commit 76b1cc55bf7823fe89de652ddf7817e8a5b496e8 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Tue Mar 18 15:54:41 2025 -0700 Add comment for issue tracking commit b495d1b85041110537dbfbce37cae45e9bb196b4 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Tue Mar 18 10:30:51 2025 -0700 Re-enable the AXI User fixes commit ad38b48 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Tue Mar 18 10:28:22 2025 -0700 Hello world testcase that shows caliptra-core fw built from caliptra-ss repo commit 62479b4 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Tue Mar 18 10:19:36 2025 -0700 Whitespace commit 69611c4 Merge: 5ba71c4 a2a3cec Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 16:45:18 2025 -0700 Merge remote-tracking branch 'chips/main' into cwhitehead-msft-local-testcode-PoC commit 5ba71c4 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 15:38:07 2025 -0700 Update testfile yml for all smoke tests commit 8ef4e6f Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 13:52:51 2025 -0700 Roll back the USER/linker modifications to isolate just the methodology changes commit 3500540 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 13:27:06 2025 -0700 Move mcu bringup tasks to shared lib file; update Makefile to init data to DCCM and build libs commit 60ee631 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 12:03:27 2025 -0700 Reorganize the libs area commit d40b3c6 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 11:21:18 2025 -0700 Rename top test list file commit e6ba3ee Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 11:19:59 2025 -0700 Makefile cleanup commit 384ed48 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:46:26 2025 -0700 Revert changes to mcu_hello_world -- it's a defunct test commit 8fcfd45 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:42:53 2025 -0700 Add explanatory note/TODO on LSU user commit 2e98c2d Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:35:39 2025 -0700 Update RTL submodule to pull fw_test_rom updates commit 9ee216d Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:32:40 2025 -0700 Remove cptra AxUSER force; TMP: set cptra AxUSER as SOC CONFIG user commit 5ff6e31 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:29:50 2025 -0700 Initialize data/bss/STACK to DCCM, as the MCU SRAM is locked at startup commit 7b7181b Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:29:13 2025 -0700 Fixes to get cptra_ss_i3c_recovery pre-exec working commit 6edb48a Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:28:13 2025 -0700 Unique AxUSER for Caliptra, MCU-LSU, and MCU-IFU commit 33324b2 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Mon Mar 17 10:27:30 2025 -0700 Regenerate RDL files and update workflow to catch out of date RDL commit 4aeedfc Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Fri Mar 14 12:03:55 2025 -0700 Use DEBUG_OUT as STDOUT in ss sims commit 691f2f9 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 13 15:28:01 2025 -0700 Fix user signals and config so design boots with Caliptra ROM commit 37b630c Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 13 14:57:22 2025 -0700 Add caliptra subsystem macro to compile.yml; update test-suites with plusargs/pre_exec commit 41b423f Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 13 13:25:37 2025 -0700 Remove recipe for program.hex commit eba6fd6 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 13 12:39:09 2025 -0700 Add a top-level include file that grabs all css ai3c tests commit 6057cd3 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 13 12:38:42 2025 -0700 Rename ai3ct test as svh, since it's an include commit a5a3651 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 13 12:36:59 2025 -0700 Reorganize ai3c tests commit e058463 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 6 18:04:07 2025 -0800 Ending quote - syntax commit 052f1e0 Author: Caleb Whitehead <cwhitehead@microsoft.com> Date: Thu Mar 6 17:56:02 2025 -0800 Initial test code for bringup with local caliptra-core images

src/integration/rtl/caliptra_ss_includes.svh

src/integration/testbench/caliptra_ss_top_tb.sv

src/integration/rtl/caliptra_ss_top.sv

src/integration/testbench/caliptra_ss_top_tb.sv

src/integration/test_suites/libs/riscv_hw_if/link.ld

…4PC (which should be acquired from Arm website)

…er-fixes

…with updated timestamp and hash after successful run

ekarabu requested changes Mar 19, 2025

View reviewed changes

src/integration/rtl/caliptra_ss_includes.svh Show resolved Hide resolved

src/integration/testbench/caliptra_ss_top_tb.sv Show resolved Hide resolved

calebofearth commented Mar 19, 2025

View reviewed changes

src/integration/rtl/caliptra_ss_top.sv Outdated Show resolved Hide resolved

clayton8 reviewed Mar 20, 2025

View reviewed changes

src/integration/rtl/caliptra_ss_top.sv Outdated Show resolved Hide resolved

src/integration/testbench/caliptra_ss_top_tb.sv Outdated Show resolved Hide resolved

src/integration/test_suites/libs/riscv_hw_if/link.ld Outdated Show resolved Hide resolved

calebofearth added 4 commits March 20, 2025 18:04

remove cptra_ss_strap_cptra_axi_user_i

027c0b8

Set caliptra as mcu_sram config user

eb73add

Move avery_vip target inside top compile.yml; regenerate file lists

1a98b85

Update file-lists to provide an overrideable variable pointing to Axi…

9d42578

…4PC (which should be acquired from Arm website)

calebofearth requested a review from ekarabu March 24, 2025 00:23

ekarabu previously approved these changes Mar 24, 2025

View reviewed changes

calebofearth added 3 commits March 23, 2025 19:00

Remove old commented-out linker sections

ebb9007

Revert compile.yml reorg - pick that up with a different PR

0beae7d

Merge remote-tracking branch 'chips/main' into cwhitehead-msft-axi-us…

7da83e1

…er-fixes

calebofearth dismissed ekarabu’s stale review via 7da83e1 March 24, 2025 02:11

calebofearth added 10 commits March 23, 2025 19:16

Restore avery_vip.yml

55cb49b

Fix boot seqr counter for deasserting MCU reset

61b6b57

Drive MCU reset vector using the actual strap from MCI

371ab1f

Add the full MCU/MCI fw update reset sequence to the bringup test

95bb288

Rearrange dbg signal to go with other dbg signals

a4d7367

Infinite loop while waiting for reset

3e86a86

Perform the MCU halt handshake before issuing MCU reset for FW UPD

9ae503e

Remove avery_vip.vf - will be added in separate workflow/file-list PR

386df52

Clarification on FIXME

28d5b72

Cleanup FIXMEs

557164b

ekarabu previously approved these changes Mar 24, 2025

View reviewed changes

clayton8 previously approved these changes Mar 24, 2025

View reviewed changes

MICROSOFT AUTOMATED PIPELINE: Stamp 'cwhitehead-msft-axi-user-fixes' …

8a9e312

…with updated timestamp and hash after successful run

nileshbpat dismissed stale reviews from clayton8 and ekarabu via 8a9e312 March 24, 2025 20:15

calebofearth requested a review from clayton8 March 24, 2025 20:18

calebofearth requested a review from ekarabu March 24, 2025 20:18

clayton8 approved these changes Mar 24, 2025

View reviewed changes

ekarabu approved these changes Mar 24, 2025

View reviewed changes

calebofearth changed the title ~~[RTL] AXI USER fixes to get cptra_ss_i3c_recovery working~~ [RTL] AXI USER fixes and updates to mcu_cptra_bringup to execute FW UPD flow Mar 24, 2025

calebofearth merged commit 6109f4f into main Mar 24, 2025
6 checks passed

calebofearth deleted the cwhitehead-msft-axi-user-fixes branch March 24, 2025 21:18

This was referenced Mar 26, 2025

MCU Hitless Update -- reset assertion timing #165

Closed

MCI Reset deassertion #166

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RTL] AXI USER fixes and updates to mcu_cptra_bringup to execute FW UPD flow#150

[RTL] AXI USER fixes and updates to mcu_cptra_bringup to execute FW UPD flow#150
calebofearth merged 19 commits intomainfrom
cwhitehead-msft-axi-user-fixes

calebofearth commented Mar 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

calebofearth commented Mar 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants