Skip to content

Cherry-pick to master: [rom_ext] Clean up ROM_EXT prints #27286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfrantz merged 1 commit into from
May 29, 2025
Merged

Cherry-pick to master: [rom_ext] Clean up ROM_EXT prints #27286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sw/device/silicon_creator/rom/e2e/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MSG_TEMPLATE_BFV_LCV = "{}{}\r\n{}{}\r\n(?s:.*){}{}\r\n{}{}\r\n".format(
"{1}",
)

MSG_STARTING_ROM_EXT = "Starting ROM_EXT"
MSG_STARTING_ROM_EXT = "ROM_EXT:[^\r\n]*\r\n"

MSG_PASS = "PASS!"

Expand Down
7 changes: 3 additions & 4 deletions sw/device/silicon_creator/rom_ext/rom_ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static rom_error_t rom_ext_verify(const manifest_t *manifest,
RETURN_IF_ERROR(owner_keyring_find_key(&keyring, key_id, &verify_key));
uint32_t key_alg = keyring.key[verify_key]->key_alg;

dbg_printf("app_verify: key=%u alg=%C domain=%C\r\n", verify_key, key_alg,
dbg_printf("verify: key=%u;%C;%C\r\n", verify_key, key_alg,
keyring.key[verify_key]->key_domain);

memset(boot_measurements.bl0.data, (int)rnd_uint32(),
Expand Down Expand Up @@ -697,8 +697,7 @@ static rom_error_t rom_ext_try_next_stage(boot_data_t *boot_data,
static rom_error_t rom_ext_start(boot_data_t *boot_data, boot_log_t *boot_log) {
HARDENED_RETURN_IF_ERROR(rom_ext_init(boot_data));
const manifest_t *self = rom_ext_manifest();
dbg_printf("Starting ROM_EXT %u.%u\r\n", self->version_major,
self->version_minor);
dbg_printf("ROM_EXT:%u.%u\r\n", self->version_major, self->version_minor);

uint32_t hash_enforcement =
otp_read32(OTP_CTRL_PARAM_CREATOR_SW_CFG_IMMUTABLE_ROM_EXT_EN_OFFSET);
Expand Down Expand Up @@ -731,7 +730,7 @@ static rom_error_t rom_ext_start(boot_data_t *boot_data, boot_log_t *boot_log) {
// TODO(cfrantz): evaluate permissible ownership init failure conditions
// and change this to HARDENED_RETURN_IF_ERROR.
if (error != kErrorOk) {
dbg_printf("ownership_init: %x\r\n", error);
dbg_printf("error: ownership_init=%x\r\n", error);
}

// Configure SRAM execution as the owner requested.
Expand Down
2 changes: 1 addition & 1 deletion sw/host/provisioning/ft_lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ pub fn check_rom_ext_boot_up(
) -> Result<()> {
transport.reset_target(init.bootstrap.options.reset_delay, true)?;
let uart_console = transport.uart("console")?;
let _ = UartConsole::wait_for(&*uart_console, r"Starting ROM_EXT.*\r\n", timeout)?;
let _ = UartConsole::wait_for(&*uart_console, r"ROM_EXT:.*\r\n", timeout)?;

// Timeout for waiting for a potential error message indicating invalid UDS certificate.
// This value is tested on fpga cw340 and could be potentially fine-tuned.
Expand Down
6 changes: 3 additions & 3 deletions sw/host/tests/ownership/transfer_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fn transfer_test(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
log::info!("###### Pre-transfer Boot Check ######");
let capture = UartConsole::wait_for(
&*uart,
r"(?msR)Starting.*ownership_state = (\w+)$.*PASS!$|BFV:([0-9A-Fa-f]{8})$",
r"(?msR)Running.*ownership_state = (\w+)$.*PASS!$|BFV:([0-9A-Fa-f]{8})$",
opts.timeout,
)?;
if capture[0].starts_with("BFV") {
Expand Down Expand Up @@ -146,7 +146,7 @@ fn transfer_test(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
transport.reset_target(Duration::from_millis(50), /*clear_uart=*/ true)?;
let capture = UartConsole::wait_for(
&*uart,
r"(?msR)Starting.*ownership_state = (\w+)$.*ownership_transfers = (\d+)$.*PASS!$|BFV:([0-9A-Fa-f]{8})$",
r"(?msR)Running.*ownership_state = (\w+)$.*ownership_transfers = (\d+)$.*PASS!$|BFV:([0-9A-Fa-f]{8})$",
opts.timeout,
)?;
if capture[0].starts_with("BFV") {
Expand Down Expand Up @@ -189,7 +189,7 @@ fn transfer_test(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
transport.reset_target(Duration::from_millis(50), /*clear_uart=*/ true)?;
let capture = UartConsole::wait_for(
&*uart,
r"(?msR)Starting.*ownership_state = (\w+)$.*ownership_transfers = (\d+)$.*PASS!$|BFV:([0-9A-Fa-f]{8})$",
r"(?msR)Running.*ownership_state = (\w+)$.*ownership_transfers = (\d+)$.*PASS!$|BFV:([0-9A-Fa-f]{8})$",
opts.timeout,
)?;
if capture[0].starts_with("BFV") {
Expand Down
Loading