saymrwulf/betrusted-curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/betrusted-curve25519-dalek-source.git synced 2026-09-10 21:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make ensure_engine() falliable

Browse source 
this will trigger software fallback
This commit is contained in:
bunnie 2024-03-25 13:43:38 +08:00
parent 275f586b60
commit 0b052f5f79
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
curve25519-dalek/src/backend/serial/u32e/mod.rs
View file

@ -34,6 +34,7 @@ pub(crate) const RF_U8_BASE: usize = 0x1_0000;
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) const RF_U32_BASE: usize = 0x1_0000 / 4; pub(crate) const RF_U32_BASE: usize = 0x1_0000 / 4;
/// It is safe to call this multiple times.
pub fn free_engine() { pub fn free_engine() {
log::debug!("free engine"); log::debug!("free engine");
if let Some(base) = unsafe { ENGINE_BASE.take() } { if let Some(base) = unsafe { ENGINE_BASE.take() } {
@ -46,15 +47,15 @@ pub fn free_engine() {
} }
} }
pub fn ensure_engine() { /// It is safe to call this multiple times.
pub fn ensure_engine() -> Result<(), xous::Error> {
if unsafe { ENGINE_BASE.is_none() } { if unsafe { ENGINE_BASE.is_none() } {
let base = xous::syscall::map_memory( let base = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::engine::HW_ENGINE_BASE), xous::MemoryAddress::new(utra::engine::HW_ENGINE_BASE),
None, None,
4096, 4096,
xous::MemoryFlags::R | xous::MemoryFlags::W, xous::MemoryFlags::R | xous::MemoryFlags::W,
) )?;
.expect("couldn't map engine CSR range");
log::debug!("claiming engine csr {:x?}", base.as_ptr()); log::debug!("claiming engine csr {:x?}", base.as_ptr());
unsafe { unsafe {
ENGINE_BASE = Some(base); ENGINE_BASE = Some(base);
@ -66,13 +67,13 @@ pub fn ensure_engine() {
None, None,
HW_ENGINE_MEM_LEN, HW_ENGINE_MEM_LEN,
xous::MemoryFlags::R | xous::MemoryFlags::W, xous::MemoryFlags::R | xous::MemoryFlags::W,
) )?;
.expect("couldn't map engine memory window range");
log::debug!("claiming engine mem {:x?}", mem.as_ptr()); log::debug!("claiming engine mem {:x?}", mem.as_ptr());
unsafe { ENGINE_MEM = Some(mem) }; unsafe { ENGINE_MEM = Some(mem) };
} }
let mut engine = utralib::CSR::new(unsafe { ENGINE_BASE.unwrap() }.as_mut_ptr() as *mut u32); let mut engine = utralib::CSR::new(unsafe { ENGINE_BASE.unwrap() }.as_mut_ptr() as *mut u32);
engine.rmwf(utra::engine::POWER_ON, 1); engine.rmwf(utra::engine::POWER_ON, 1);
Ok(())
} }
/// Safety: must be called after ensure_engine() /// Safety: must be called after ensure_engine()