[test] Add rom_e2e_bootstrap_phase1_page_erase
Fixes #14461
Signed-off-by: Alphan Ulusoy <alphan@google.com>
diff --git a/sw/device/silicon_creator/rom/data/rom_testplan.hjson b/sw/device/silicon_creator/rom/data/rom_testplan.hjson
index e4ba577..501401f 100644
--- a/sw/device/silicon_creator/rom/data/rom_testplan.hjson
+++ b/sw/device/silicon_creator/rom/data/rom_testplan.hjson
@@ -334,19 +334,19 @@
- For `erase` in {`SECTOR_ERASE` (`0x20`), `CHIP_ERASE` (`0xc7`)}:
- Apply bootstrap pin strapping and reset the chip.
- Send `erase`.
- - Write `0x4552544f` (ASCII "OTRE") at byte offset `0x334`.
- - Write `0x1` at byte offset `0x374`.
+ - Write `0x4552544f_00000000` (ASCII "\0\0\0\0OTRE") at byte offset `0x80330`.
+ - Note: Writes must start at a flash-word-aligned address and we
+ must write to the second slot since ROM returns the last error.
- Release pins and reset.
- - Verify that the chip outputs the expected `BFV`: `024d410d` over UART.
+ - Verify that the chip outputs the expected `BFV`: `0242500d`
+ over UART (`kErrorBootPolicyBadLength`).
- ROM will continously reset the chip and output the same `BFV` and `LCV`.
- Apply bootstrap pin strapping and reset the chip.
- Send `erase`.
- Release pins and reset.
- - Verify that the chip outputs the expected `BFV`: `0142500d` over UART.
+ - Verify that the chip outputs the expected `BFV`: `0142500d`
+ over UART (`kErrorBootPolicyBadIdentifier`).
- ROM will continously reset the chip and output the same `BFV` and `LCV`.
-
- Note: For additional coverage we can also add another test point that uses a test
- program on flash.
'''
tags: ["rom", "verilator", "dv", "fpga", "silicon"]
stage: V2
diff --git a/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs b/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs
index 6067ba7..3f70b58 100644
--- a/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs
+++ b/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs
@@ -341,6 +341,58 @@
Ok(())
}
+fn test_bootstrap_phase1_erase(
+ opts: &Opts,
+ transport: &TransportWrapper,
+ erase_cmd: u8,
+) -> Result<()> {
+ let _bs = BootstrapTest::start(transport, opts.init.bootstrap.options.reset_delay)?;
+ let spi = transport.spi("0")?;
+ let uart = transport.uart("0")?;
+ let spiflash = SpiFlash::from_spi(&*spi)?;
+ let mut console = UartConsole {
+ timeout: Some(Duration::new(1, 0)),
+ ..Default::default()
+ };
+
+ let erase = || match erase_cmd {
+ SpiFlash::SECTOR_ERASE => spiflash.erase(&*spi, 0, 4096),
+ SpiFlash::CHIP_ERASE => spiflash.chip_erase(&*spi),
+ _ => bail!("Unexpected erase command opcode: {:?}", erase_cmd),
+ };
+
+ // Send `erase_cmd` to transition to phase 2.
+ erase()?
+ // Write "OTRE" to the identifier field of the manifest in the second slot.
+ .program(&*spi, 0x80330, &0x4552544f_00000000u64.to_le_bytes())?;
+
+ // Remove strapping so that chip fails to boot instead of going into bootstrap.
+ transport.remove_pin_strapping("ROM_BOOTSTRAP")?;
+ transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?;
+ // `kErrorBootPolicyBadLength` (0242500d) is defined in `error.h`.
+ console.exit_success = Some(Regex::new("BFV:0242500d")?);
+ let result = console.interact(&*uart, None, Some(&mut std::io::stdout()))?;
+ if result != ExitStatus::ExitSuccess {
+ bail!("FAIL: {:?}", result);
+ }
+
+ // Put the chip into bootstrap mode again and erase.
+ transport.apply_pin_strapping("ROM_BOOTSTRAP")?;
+ transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?;
+ erase()?;
+ uart.clear_rx_buffer()?;
+ transport.remove_pin_strapping("ROM_BOOTSTRAP")?;
+ transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?;
+ // `kErrorBootPolicyBadIdentifier` (0142500d) is defined in `error.h`.
+ console.exit_success = Some(Regex::new("BFV:0142500d")?);
+ let result = console.interact(&*uart, None, Some(&mut std::io::stdout()))?;
+ if result != ExitStatus::ExitSuccess {
+ bail!("FAIL: {:?}", result);
+ }
+
+ Ok(())
+}
+
fn main() -> Result<()> {
let opts = Opts::from_args();
opts.init.init_logging();
@@ -361,6 +413,9 @@
}
execute_test!(test_bootstrap_phase1_reset, &opts, &transport);
execute_test!(test_bootstrap_phase1_page_program, &opts, &transport);
+ for erase_cmd in [SpiFlash::SECTOR_ERASE, SpiFlash::CHIP_ERASE] {
+ execute_test!(test_bootstrap_phase1_erase, &opts, &transport, erase_cmd);
+ }
Ok(())
}
