incorporate latest changes into the swap init routine

This commit is contained in:
bunnie 2024-04-30 17:47:36 +08:00
parent 7ae34ed717
commit c68e351bcc

View file

@ -79,6 +79,8 @@ impl SwapHal {
// setup the I/O pins // setup the I/O pins
let mut iox = Iox::new(utralib::generated::HW_IOX_BASE as *mut u32); let mut iox = Iox::new(utralib::generated::HW_IOX_BASE as *mut u32);
#[cfg(feature = "spi-alt-channel")]
let channel = {
// JQSPI1 // JQSPI1
// SPIM_CLK_A[0] // SPIM_CLK_A[0]
setup_port( setup_port(
@ -87,8 +89,8 @@ impl SwapHal {
4, 4,
Some(IoxFunction::AF1), Some(IoxFunction::AF1),
Some(IoxDir::Output), Some(IoxDir::Output),
Some(IoxDriveStrength::Drive2mA), Some(IoxDriveStrength::Drive4mA),
Some(IoxEnable::Disable), Some(IoxEnable::Enable),
None, None,
None, None,
); );
@ -130,7 +132,12 @@ impl SwapHal {
None, None,
None, None,
); );
/* // JPC7_13 udma_global.clock_on(PeriphId::Spim0); // JQSPI1
SpimChannel::Channel0
};
#[cfg(not(feature = "spi-alt-channel"))]
let channel = {
// JPC7_13
// SPIM_CLK_A[1] // SPIM_CLK_A[1]
setup_port( setup_port(
&mut iox, &mut iox,
@ -138,17 +145,17 @@ impl SwapHal {
11, 11,
Some(IoxFunction::AF1), Some(IoxFunction::AF1),
Some(IoxDir::Output), Some(IoxDir::Output),
Some(IoxDriveStrength::Drive2mA), Some(IoxDriveStrength::Drive4mA),
Some(IoxEnable::Disable), Some(IoxEnable::Enable),
None, None,
None, None,
); );
// SPIM_SD[0-3]_A[1] // SPIM_SD[0-3]_A[1]
for i in 0..3 { for i in 7..11 {
setup_port( setup_port(
&mut iox, &mut iox,
IoxPort::PC, IoxPort::PC,
i + 7, i,
Some(IoxFunction::AF1), Some(IoxFunction::AF1),
None, None,
Some(IoxDriveStrength::Drive2mA), Some(IoxDriveStrength::Drive2mA),
@ -157,7 +164,7 @@ impl SwapHal {
None, None,
); );
} }
// SPIM_CSN0_A[0] // SPIM_CSN0_A[1]
setup_port( setup_port(
&mut iox, &mut iox,
IoxPort::PC, IoxPort::PC,
@ -168,7 +175,22 @@ impl SwapHal {
Some(IoxEnable::Enable), Some(IoxEnable::Enable),
None, None,
None, None,
); */ );
// SPIM_CSN0_A[1]
setup_port(
&mut iox,
IoxPort::PC,
13,
Some(IoxFunction::AF1),
Some(IoxDir::Output),
Some(IoxDriveStrength::Drive2mA),
Some(IoxEnable::Enable),
None,
None,
);
udma_global.clock_on(PeriphId::Spim1); // JPC7_13
SpimChannel::Channel1
};
let mut udma_global = GlobalConfig::new(utralib::generated::HW_UDMA_CTRL_BASE as *mut u32); let mut udma_global = GlobalConfig::new(utralib::generated::HW_UDMA_CTRL_BASE as *mut u32);
udma_global.clock_on(PeriphId::Spim0); // JQSPI1 udma_global.clock_on(PeriphId::Spim0); // JQSPI1
@ -177,7 +199,7 @@ impl SwapHal {
// safety: this is safe because clocks have been set up // safety: this is safe because clocks have been set up
let mut flash_spim = unsafe { let mut flash_spim = unsafe {
Spim::new_with_ifram( Spim::new_with_ifram(
SpimChannel::Channel0, channel,
50_000_000, 50_000_000,
50_000_000, 50_000_000,
SpimClkPol::LeadingEdgeRise, SpimClkPol::LeadingEdgeRise,
@ -195,7 +217,7 @@ impl SwapHal {
let mut ram_spim = unsafe { let mut ram_spim = unsafe {
Spim::new_with_ifram( Spim::new_with_ifram(
SpimChannel::Channel0, channel,
50_000_000, 50_000_000,
50_000_000, 50_000_000,
SpimClkPol::LeadingEdgeRise, SpimClkPol::LeadingEdgeRise,
@ -210,9 +232,19 @@ impl SwapHal {
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),
) )
}; };
// turn off QPI mode, in case it was set from a reboot in a bad state
flash_spim.mem_qpi_mode(false);
ram_spim.mem_qpi_mode(false);
// sanity check: read ID // sanity check: read ID
println!("flash ID: {:x}", flash_spim.mem_read_id()); let flash_id = flash_spim.mem_read_id_flash();
println!("ram ID: {:x}", ram_spim.mem_read_id()); let ram_id = ram_spim.mem_read_id_ram();
crate::println!("flash ID: {:x}", flash_id);
crate::println!("ram ID: {:x}", ram_id);
// density 18, memory type 20, mfg ID C2 ==> MX25L128833F
assert!(flash_id & 0xFF_FF_FF == 0x1820C2);
// KGD 5D, mfg ID 9D; remainder of bits are part of the EID
assert!(ram_id & 0xFF_FF == 0x5D9D);
// setup FLASH // setup FLASH
// - QE enable // - QE enable
@ -226,6 +258,16 @@ impl SwapHal {
flash_spim.mem_qpi_mode(true); flash_spim.mem_qpi_mode(true);
ram_spim.mem_qpi_mode(true); ram_spim.mem_qpi_mode(true);
// re-check the ID to confirm we entered QPI mode correctly
let flash_id = flash_spim.mem_read_id_flash();
let ram_id = ram_spim.mem_read_id_ram();
crate::println!("QPI flash ID: {:x}", flash_id);
crate::println!("QPI ram ID: {:x}", ram_id);
// density 18, memory type 20, mfg ID C2 ==> MX25L128833F
assert!(flash_id & 0xFF_FF_FF == 0x1820C2);
// KGD 5D, mfg ID 9D; remainder of bits are part of the EID
assert!(ram_id & 0xFF_FF == 0x5D9D);
// 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
@ -247,7 +289,7 @@ impl SwapHal {
// generate a random key for swap // generate a random key for swap
let mut trng = sce::trng::Trng::new(utralib::generated::HW_TRNG_BASE as usize); let mut trng = sce::trng::Trng::new(utralib::generated::HW_TRNG_BASE as usize);
trng.setup_raw_generation(256); trng.setup_raw_generation(32);
let mut seed = 0u64; let mut seed = 0u64;
seed |= trng.get_u32().expect("TRNG error") as u64; seed |= trng.get_u32().expect("TRNG error") as u64;
seed |= (trng.get_u32().expect("TRNG error") as u64) << 32; seed |= (trng.get_u32().expect("TRNG error") as u64) << 32;