From aed2325f688b11f1f06cbb685d6b8a6ae42dffa7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 9 Apr 2021 17:31:36 +0800 Subject: [PATCH] fix some minor bugs in hosted mode memory is not page-aligned so `if !cfg()`-out the alignment checks in hosted mode --- kernel/src/mem.rs | 6 ++++-- kernel/src/server.rs | 6 ++++-- kernel/src/syscall.rs | 6 ++++-- services/gam/src/status.rs | 2 +- services/llio/src/lib.rs | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 4de423be9..8481816a9 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -620,8 +620,10 @@ impl MemoryManager { let addr = addr as usize; // Ensure the address lies on a page boundary - if addr & 0xfff != 0 { - return Err(xous_kernel::Error::BadAlignment); + if cfg!(baremetal) { + if addr & 0xfff != 0 { + return Err(xous_kernel::Error::BadAlignment); + } } let mut offset = 0; diff --git a/kernel/src/server.rs b/kernel/src/server.rs index 021837184..ad2668465 100644 --- a/kernel/src/server.rs +++ b/kernel/src/server.rs @@ -356,8 +356,10 @@ impl Server { let mut result = Ok(xous_kernel::Result::Ok); let virt = server_memory_addr; let size = memory_length; - if virt & 0xfff != 0 { - return Err(xous_kernel::Error::BadAlignment); + if !cfg!(baremetal) { + if virt & 0xfff != 0 { + return Err(xous_kernel::Error::BadAlignment); + } } for addr in (virt..(virt + size)).step_by(crate::mem::PAGE_SIZE) { if let Err(e) = mm.unmap_page(addr as *mut usize) { diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index ad82d9be2..f54d2c950 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -657,8 +657,10 @@ pub fn handle_inner(pid: PID, tid: TID, in_irq: bool, call: SysCall) -> SysCallR let mut result = Ok(xous_kernel::Result::Ok); let virt = range.as_ptr() as usize; let size = range.len(); - if virt & 0xfff != 0 { - return Err(xous_kernel::Error::BadAlignment); + if cfg!(baremetal) { + if virt & 0xfff != 0 { + return Err(xous_kernel::Error::BadAlignment); + } } for addr in (virt..(virt + size)).step_by(PAGE_SIZE) { if let Err(e) = mm.unmap_page(addr as *mut usize) { diff --git a/services/gam/src/status.rs b/services/gam/src/status.rs index b757e1fb6..0f6b3c0fd 100644 --- a/services/gam/src/status.rs +++ b/services/gam/src/status.rs @@ -36,7 +36,7 @@ pub fn dt_callback(dt: rtc::DateTime) { //log::trace!("dt_callback received with {:?}", dt); if let Some(cb_to_main_conn) = unsafe{CB_TO_MAIN_CONN} { let buf = xous_ipc::Buffer::into_buf(dt).or(Err(xous::Error::InternalError)).unwrap(); - buf.lend(cb_to_main_conn, StatusOpcode::DateTime.to_u32().unwrap()).unwrap(); + buf.send(cb_to_main_conn, StatusOpcode::DateTime.to_u32().unwrap()).unwrap(); } } diff --git a/services/llio/src/lib.rs b/services/llio/src/lib.rs index bdde8b3ca..2f8c39be4 100644 --- a/services/llio/src/lib.rs +++ b/services/llio/src/lib.rs @@ -81,7 +81,7 @@ impl Llio { } pub fn allow_power_off(&self, allow: bool) -> Result<(), xous::Error> { - let arg = if allow { 1 } else { 0 }; + let arg = if allow { 0 } else { 1 }; send_message(self.conn, Message::new_scalar(Opcode::PowerSelf.to_usize().unwrap(), arg, 0, 0, 0) ).map(|_| ())