add some tests for the SPIM memory interface

This commit is contained in:
bunnie 2024-05-05 21:51:48 +08:00
parent 8ceaa1afe4
commit 10d613b95d
3 changed files with 102 additions and 17 deletions

View file

@ -206,8 +206,8 @@ pub fn early_init() {
crate::println!("trng status: {:x}", trng_csr.r(utra::trng::SFR_SR)); crate::println!("trng status: {:x}", trng_csr.r(utra::trng::SFR_SR));
// do a PL230/PIO test. Toggles PB15 (PIO0) with an LFSR sequence. // do a PL230/PIO test. Toggles PB15 (PIO0) with an LFSR sequence.
let mut pl230 = xous_pl230::Pl230::new(); // let mut pl230 = xous_pl230::Pl230::new();
xous_pl230::pl230_tests::units::basic_tests(&mut pl230); // xous_pl230::pl230_tests::units::basic_tests(&mut pl230);
// xous_pl230::pl230_tests::units::pio_test(&mut pl230); // xous_pl230::pl230_tests::units::pio_test(&mut pl230);
const BANNER: &'static str = "\n\rKeep pressing keys to continue boot...\r\n"; const BANNER: &'static str = "\n\rKeep pressing keys to continue boot...\r\n";
@ -481,7 +481,7 @@ pub fn early_init() {
// sanity check: read ID // sanity check: read ID
crate::println!("read ID..."); crate::println!("read ID...");
udma_uart.read(&mut rx_buf[..1]); // getc();
let flash_id = flash_spim.mem_read_id_flash(); let flash_id = flash_spim.mem_read_id_flash();
let ram_id = ram_spim.mem_read_id_ram(); let ram_id = ram_spim.mem_read_id_ram();
crate::println!("flash ID: {:x}", flash_id); crate::println!("flash ID: {:x}", flash_id);
@ -495,7 +495,7 @@ pub fn early_init() {
// - QE enable // - QE enable
// - dummy cycles = 8 // - dummy cycles = 8
crate::println!("write SR..."); crate::println!("write SR...");
udma_uart.read(&mut rx_buf[..1]); // getc();
flash_spim.mem_write_status_register(0b01_0000_00, 0b10_00_0_111); flash_spim.mem_write_status_register(0b01_0000_00, 0b10_00_0_111);
// set SPI devices to QPI mode // set SPI devices to QPI mode
@ -503,12 +503,12 @@ pub fn early_init() {
// We expect a ISS66WVS4M8BLL (3.3V) on CS1 // We expect a ISS66WVS4M8BLL (3.3V) on CS1
// Both support QPI. // Both support QPI.
crate::println!("set QPI mode..."); crate::println!("set QPI mode...");
udma_uart.read(&mut rx_buf[..1]); // getc();
flash_spim.mem_qpi_mode(true); flash_spim.mem_qpi_mode(true);
ram_spim.mem_qpi_mode(true); ram_spim.mem_qpi_mode(true);
crate::println!("read ID QPI mode..."); crate::println!("read ID QPI mode...");
udma_uart.read(&mut rx_buf[..1]); // getc();
let flash_id = flash_spim.mem_read_id_flash(); let flash_id = flash_spim.mem_read_id_flash();
let ram_id = ram_spim.mem_read_id_ram(); let ram_id = ram_spim.mem_read_id_ram();
crate::println!("QPI flash ID: {:x}", flash_id); crate::println!("QPI flash ID: {:x}", flash_id);
@ -520,7 +520,6 @@ pub fn early_init() {
let mut chk_buf = [0u8; 32]; let mut chk_buf = [0u8; 32];
crate::println!("first read..."); crate::println!("first read...");
udma_uart.read(&mut rx_buf[..1]);
crate::println!("flash read"); crate::println!("flash read");
flash_spim.mem_read(0x0, &mut chk_buf); flash_spim.mem_read(0x0, &mut chk_buf);
crate::println!("flash: {:x?}", chk_buf); crate::println!("flash: {:x?}", chk_buf);
@ -530,16 +529,58 @@ pub fn early_init() {
*d = i as u8; *d = i as u8;
} }
crate::println!("ram write..."); crate::println!("ram write...");
udma_uart.read(&mut rx_buf[..1]);
ram_spim.mem_ram_write(0x0, &chk_buf); ram_spim.mem_ram_write(0x0, &chk_buf);
chk_buf.fill(0); chk_buf.fill(0);
crate::println!("empty buf: {:x?}", chk_buf); crate::println!("empty buf: {:x?}", chk_buf);
crate::println!("ram read..."); crate::println!("ram read...");
udma_uart.read(&mut rx_buf[..1]);
ram_spim.mem_read(0x0, &mut chk_buf); ram_spim.mem_read(0x0, &mut chk_buf);
crate::println!("RAM checked: {:x?}", chk_buf); crate::println!("RAM checked: {:x?}", chk_buf);
/*
crate::println!("Press any key to start SPIM RAM write test");
let test_blocks = 4;
getc();
let mut big_buf = [0u8; 4096];
for offset in (0..0x1000 * test_blocks).step_by(0x1000) {
let mut test_pat = TestPattern::new(Some(offset));
for d in big_buf.chunks_mut(4) {
d.copy_from_slice(&test_pat.next().to_le_bytes());
}
ram_spim.mem_ram_write(offset, &mut big_buf);
crate::println!(
"Offset: {:x} -> {:x?}..{:x?}",
offset,
&big_buf[..16],
&big_buf[big_buf.len() - 16..]
);
}
crate::println!("Press any key to start SPIM RAM read test");
getc();
let mut failures = 0;
use core::convert::TryInto;
for offset in (0..0x1000 * test_blocks).step_by(0x1000) {
let mut test_pat = TestPattern::new(Some(offset));
ram_spim.mem_read(offset, &mut big_buf);
crate::println!(
"Offset: {:x} -> {:x?}..{:x?}",
offset,
&big_buf[..16],
&big_buf[big_buf.len() - 16..]
);
for d in big_buf.chunks(4) {
let val = u32::from_le_bytes(d.try_into().unwrap());
let expected = test_pat.next();
if val != expected {
failures += 1;
}
}
}
crate::println!("total failures: {}", failures);
crate::println!("SPIM ram test done; press any key to continue...");
getc();
*/
/* /*
crate::println!("looping around, turning off QPI mode!"); crate::println!("looping around, turning off QPI mode!");
udma_uart.read(&mut rx_buf[..1]); udma_uart.read(&mut rx_buf[..1]);
@ -559,8 +600,9 @@ pub fn early_init() {
} }
} }
const ONWARD: &'static str = "\n\rBooting!\n\r"; crate::println!("Press any key to continue...");
udma_uart.write(&ONWARD.as_bytes()); getc();
crate::println!("\n\rBooting!\n\r");
} }
#[cfg(feature = "platform-tests")] #[cfg(feature = "platform-tests")]
@ -795,3 +837,40 @@ unsafe fn init_clock_asic(freq_hz: u32) -> u32 {
fn fsfreq_to_hz(fs_freq: u32) -> u32 { (fs_freq * (48_000_000 / 32)) / 1_000_000 } fn fsfreq_to_hz(fs_freq: u32) -> u32 { (fs_freq * (48_000_000 / 32)) / 1_000_000 }
fn fsfreq_to_hz_32(fs_freq: u32) -> u32 { (fs_freq * (32_000_000 / 32)) / 1_000_000 } fn fsfreq_to_hz_32(fs_freq: u32) -> u32 { (fs_freq * (32_000_000 / 32)) / 1_000_000 }
#[allow(dead_code)]
/// Used mainly for debug breaks. Not used in every configuration.
pub fn getc() -> char {
let uart_buf_addr = loader::UART_IFRAM_ADDR;
let mut udma_uart = unsafe {
// safety: this is safe to call, because we set up clock and events prior to calling new.
udma::Uart::get_handle(utra::udma_uart_1::HW_UDMA_UART_1_BASE, uart_buf_addr, uart_buf_addr)
};
let mut rx_buf = [0u8; 1];
udma_uart.read(&mut rx_buf);
char::from_u32(rx_buf[0] as u32).unwrap_or(' ')
}
#[allow(dead_code)]
pub struct TestPattern {
x: u32,
}
#[allow(dead_code)]
impl TestPattern {
pub fn new(seed: Option<u32>) -> Self { Self { x: seed.unwrap_or(0) } }
/// from https://github.com/skeeto/hash-prospector
pub fn next(&mut self) -> u32 {
if self.x == 0 {
self.x += 1;
}
self.x ^= self.x >> 17;
self.x *= 0xed5ad4bb;
self.x ^= self.x >> 11;
self.x *= 0xac4c1b51;
self.x ^= self.x >> 15;
self.x *= 0x31848bab;
self.x ^= self.x >> 14;
return self.x;
}
}

View file

@ -86,12 +86,12 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_edata = .; _edata = .;
} > REGION_DATA AT > REGION_RODATA } > REGION_DATA AT > REGION_RODATA
/*
.fonts : ALIGN(65536) .fonts : ALIGN(65536)
{ {
KEEP(*(.fontdata)); KEEP(*(.fontdata));
} > FONTS } > FONTS
*/
.bss (NOLOAD) : .bss (NOLOAD) :
{ {
_sbss = .; _sbss = .;

View file

@ -240,7 +240,10 @@ impl SwapHal {
// setup FLASH // setup FLASH
// - QE enable // - QE enable
// - dummy cycles = 6 // - dummy cycles = 6
flash_spim.mem_write_status_register(0b01_0000_00, 0b00_00_0_111); // This is not necessary: QE should be set by the external FLASH
// provisioning routine.
// TODO: figure out why writing this causes reads to break (every other read works)
// flash_spim.mem_write_status_register(0b01_0000_00, 0b00_00_0_111);
// set SPI devices to QPI mode // set SPI devices to QPI mode
// We expect a MX25L12833F (3.3V) on CS0 // We expect a MX25L12833F (3.3V) on CS0
@ -303,7 +306,12 @@ impl SwapHal {
// safety: buf.data is aligned to 4096-byte boundary and filled with initialized data // safety: buf.data is aligned to 4096-byte boundary and filled with initialized data
let ssh: &SwapSourceHeader = let ssh: &SwapSourceHeader =
unsafe { (buf.data.as_ptr() as *const SwapSourceHeader).as_ref().unwrap() }; unsafe { (buf.data.as_ptr() as *const SwapSourceHeader).as_ref().unwrap() };
println!("SwapSourceHeader: {:x?}", ssh); #[cfg(feature = "debug-print")]
{
println!("SwapSourceHeader: {:x?}", ssh);
println!("Swap key: {:x?}", &swap.key);
println!("Dest key: {:x?}", &dest_key);
}
let mut hal = SwapHal { let mut hal = SwapHal {
image_start: SWAP_IMG_START as usize + 4096, image_start: SWAP_IMG_START as usize + 4096,
image_mac_start: SWAP_IMG_START as usize + 4096 + ssh.mac_offset as usize, image_mac_start: SWAP_IMG_START as usize + 4096 + ssh.mac_offset as usize,
@ -334,13 +342,11 @@ impl SwapHal {
fn aad(&self) -> &[u8] { &self.aad_storage[..self.aad_len] } fn aad(&self) -> &[u8] { &self.aad_storage[..self.aad_len] }
pub fn decrypt_src_page_at(&mut self, offset: usize) -> &[u8] { pub fn decrypt_src_page_at(&mut self, offset: usize) -> &[u8] {
println!("in decrypt_page_at");
assert!((offset & 0xFFF) == 0, "offset is not page-aligned"); assert!((offset & 0xFFF) == 0, "offset is not page-aligned");
assert!(offset >= 0x1000); assert!(offset >= 0x1000);
// compensate for the unencrypted header that is not included in the `src_data_area` slice // compensate for the unencrypted header that is not included in the `src_data_area` slice
let offset = offset - 0x1000; let offset = offset - 0x1000;
self.buf_addr = offset; self.buf_addr = offset;
println!("bef second read");
self.flash_spim.mem_read((self.image_start + offset) as u32, &mut self.buf.data); self.flash_spim.mem_read((self.image_start + offset) as u32, &mut self.buf.data);
let mut nonce = [0u8; size_of::<Nonce>()]; let mut nonce = [0u8; size_of::<Nonce>()];
nonce[..4].copy_from_slice(&(offset as u32).to_be_bytes()); nonce[..4].copy_from_slice(&(offset as u32).to_be_bytes());