reflect API changes in code

This commit is contained in:
bunnie 2024-05-06 02:28:11 +08:00
parent 6723b9d67c
commit 05844c7646
2 changed files with 21 additions and 10 deletions

View file

@ -437,6 +437,7 @@ pub fn early_init() {
16, // just enough space to send commands 16, // just enough space to send commands
4096, 4096,
Some(8), Some(8),
None,
IframRange::from_raw_parts(SPIM_FLASH_IFRAM_ADDR, SPIM_FLASH_IFRAM_ADDR, 4096 * 2), IframRange::from_raw_parts(SPIM_FLASH_IFRAM_ADDR, SPIM_FLASH_IFRAM_ADDR, 4096 * 2),
) )
}; };
@ -455,6 +456,7 @@ pub fn early_init() {
1024, // this is limited by the page length 1024, // this is limited by the page length
1024, 1024,
Some(6), Some(6),
None,
IframRange::from_raw_parts(SPIM_RAM_IFRAM_ADDR, SPIM_RAM_IFRAM_ADDR, 4096 * 2), IframRange::from_raw_parts(SPIM_RAM_IFRAM_ADDR, SPIM_RAM_IFRAM_ADDR, 4096 * 2),
) )
}; };
@ -600,7 +602,7 @@ pub fn early_init() {
} }
} }
crate::println!("Press any key to continue..."); udma_uart.write("Press any key to continue...".as_bytes());
getc(); getc();
crate::println!("\n\rBooting!\n\r"); crate::println!("\n\rBooting!\n\r");
} }

View file

@ -202,6 +202,7 @@ impl SwapHal {
16, // just enough space to send commands 16, // just enough space to send commands
4096, 4096,
Some(6), Some(6),
None,
IframRange::from_raw_parts(SPIM_FLASH_IFRAM_ADDR, SPIM_FLASH_IFRAM_ADDR, 4096 * 2), IframRange::from_raw_parts(SPIM_FLASH_IFRAM_ADDR, SPIM_FLASH_IFRAM_ADDR, 4096 * 2),
) )
}; };
@ -220,7 +221,8 @@ impl SwapHal {
1024, // this is limited by the page length 1024, // this is limited by the page length
1024, 1024,
Some(6), Some(6),
IframRange::from_raw_parts(SPIM_RAM_IFRAM_ADDR, SPIM_RAM_IFRAM_ADDR, 4096 * 2), None,
IframRange::from_raw_parts(SPIM_RAM_IFRAM_ADDR, SPIM_RAM_IFRAM_ADDR, 4096),
) )
}; };
// turn off QPI mode, in case it was set from a reboot in a bad state // turn off QPI mode, in case it was set from a reboot in a bad state
@ -265,7 +267,7 @@ impl SwapHal {
// allocate the buf // allocate the buf
let mut buf = RawPage { data: [0u8; 4096] }; let mut buf = RawPage { data: [0u8; 4096] };
// fetch the header // fetch the header
flash_spim.mem_read(SWAP_IMG_START as u32, &mut buf.data); flash_spim.mem_read(SWAP_IMG_START as u32, &mut buf.data, false);
// compute offsets for swap // compute offsets for swap
let mac_size = (swap.ram_size as usize / 4096) * size_of::<Tag>(); let mac_size = (swap.ram_size as usize / 4096) * size_of::<Tag>();
@ -347,7 +349,7 @@ impl SwapHal {
// 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;
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, false);
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());
nonce[4..].copy_from_slice(&self.partial_nonce); nonce[4..].copy_from_slice(&self.partial_nonce);
@ -357,8 +359,11 @@ impl SwapHal {
// cheaper than the Refcell bookkeeping. // cheaper than the Refcell bookkeeping.
let mut aad = [0u8; 64]; let mut aad = [0u8; 64];
aad[..self.aad_len].copy_from_slice(self.aad()); aad[..self.aad_len].copy_from_slice(self.aad());
self.flash_spim self.flash_spim.mem_read(
.mem_read((self.image_mac_start + (offset / 4096) * size_of::<Tag>()) as u32, &mut tag); (self.image_mac_start + (offset / 4096) * size_of::<Tag>()) as u32,
&mut tag,
false,
);
match self.src_cipher.decrypt_in_place_detached( match self.src_cipher.decrypt_in_place_detached(
Nonce::from_slice(&nonce), Nonce::from_slice(&nonce),
&aad[..self.aad_len], &aad[..self.aad_len],
@ -393,10 +398,11 @@ impl SwapHal {
let aad: &[u8] = &[]; let aad: &[u8] = &[];
match self.dst_cipher.encrypt_in_place_detached(Nonce::from_slice(&nonce), aad, buf) { match self.dst_cipher.encrypt_in_place_detached(Nonce::from_slice(&nonce), aad, buf) {
Ok(tag) => { Ok(tag) => {
self.ram_spim.mem_ram_write(dest_offset as u32, buf); self.ram_spim.mem_ram_write(dest_offset as u32, buf, false);
self.ram_spim.mem_ram_write( self.ram_spim.mem_ram_write(
(self.swap_mac_start + (dest_offset / PAGE_SIZE) * size_of::<Tag>()) as u32, (self.swap_mac_start + (dest_offset / PAGE_SIZE) * size_of::<Tag>()) as u32,
tag.as_slice(), tag.as_slice(),
false,
); );
} }
Err(e) => panic!("Encryption error to swap ram: {:?}", e), Err(e) => panic!("Encryption error to swap ram: {:?}", e),
@ -416,9 +422,12 @@ impl SwapHal {
nonce[9..12].copy_from_slice(&(vpage_masked as u32).to_be_bytes()[..3]); nonce[9..12].copy_from_slice(&(vpage_masked as u32).to_be_bytes()[..3]);
let aad: &[u8] = &[]; let aad: &[u8] = &[];
let mut tag = [0u8; size_of::<Tag>()]; let mut tag = [0u8; size_of::<Tag>()];
self.ram_spim self.ram_spim.mem_read(
.mem_read((self.swap_mac_start + (src_offset / PAGE_SIZE) * size_of::<Tag>()) as u32, &mut tag); (self.swap_mac_start + (src_offset / PAGE_SIZE) * size_of::<Tag>()) as u32,
self.ram_spim.mem_read(src_offset as u32, &mut self.buf.data); &mut tag,
false,
);
self.ram_spim.mem_read(src_offset as u32, &mut self.buf.data, false);
match self.dst_cipher.decrypt_in_place_detached( match self.dst_cipher.decrypt_in_place_detached(
Nonce::from_slice(&nonce), Nonce::from_slice(&nonce),
aad, aad,