retrofit the rest of the servers for suspend/resume

we can now do suspend/resume in the xous chat!
This commit is contained in:
bunnie 2021-05-02 01:38:44 +08:00
parent 85d78439d7
commit b17753ce8b
16 changed files with 109 additions and 27 deletions

3
Cargo.lock generated
View file

@ -540,6 +540,7 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv 0.4.3",
"susres",
"utralib",
"xous",
"xous-ipc",
@ -689,6 +690,7 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv 0.4.3",
"susres",
"ticktimer-server",
"utralib",
"xous",
@ -1284,6 +1286,7 @@ dependencies = [
"num-traits",
"rkyv 0.4.3",
"rtc",
"susres",
"ticktimer-server",
"utralib",
"xous",

View file

@ -13,6 +13,8 @@ keyboard = {path = "../keyboard"}
log = "0.4"
log-server = {path = "../log-server"}
xous = {path = "../../xous-rs"}
susres = {path = "../susres"}
xous-ipc = {path = "../../xous-ipc"}
xous-names = {path = "../xous-names"}
num-derive = {version = "0.3", default-features = false}

View file

@ -79,7 +79,10 @@ pub(crate) enum Opcode {
DrawClipObject, //(ClipObject),
/// draws the sleep screen; assumes requests are vetted by GAM/xous-names
DrawSleepScreen
DrawSleepScreen,
/// SuspendResume callback
SuspendResume,
}
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)]

View file

@ -1,6 +1,7 @@
use utralib::generated::*;
use xous::MemoryRange;
use crate::api::Point;
use susres::{RegManager, RegOrField, SuspendResume, ManagedMem};
const FB_WIDTH_WORDS: usize = 11;
const FB_WIDTH_PIXELS: usize = 336;
@ -11,7 +12,9 @@ const CONFIG_CLOCK_FREQUENCY: u32 = 100_000_000;
pub struct XousDisplay {
fb: MemoryRange,
hwfb: MemoryRange,
srfb: ManagedMem::<{utralib::generated::HW_MEMLCD_MEM_LEN}>,
csr: utralib::CSR<u32>,
susres: RegManager::<{utra::memlcd::MEMLCD_NUMREGS}>,
}
impl XousDisplay {
@ -52,9 +55,12 @@ impl XousDisplay {
fb: fb,
hwfb: hwfb,
csr: CSR::new(control.as_mut_ptr() as *mut u32),
susres: RegManager::new(control.as_mut_ptr() as *mut u32),
srfb: ManagedMem::new(hwfb),
};
display.set_clock(CONFIG_CLOCK_FREQUENCY);
display.susres.push(RegOrField::Field(utra::memlcd::PRESCALER_PRESCALER), None);
display.sync_clear();
/*
@ -67,6 +73,19 @@ impl XousDisplay {
display
}
pub fn suspend(&mut self) {
while self.busy() {
// just wait until any pending FB operations are done
}
self.srfb.suspend();
self.susres.suspend();
}
pub fn resume(&mut self) {
self.susres.resume();
self.srfb.resume();
}
pub fn screen_size(&self) -> Point { Point::new(FB_WIDTH_PIXELS as i16, FB_LINES as i16) }
pub fn redraw(&mut self) {

View file

@ -65,6 +65,8 @@ impl XousDisplay {
emulated_buffer: [0u32; FB_SIZE],
}
}
pub fn suspend(&self) {}
pub fn resume(&self) {}
pub fn screen_size(&self) -> Point {
Point::new(WIDTH as i16, HEIGHT as i16)

View file

@ -89,6 +89,10 @@ fn xmain() -> ! {
op::rounded_rectangle(display.native_buffer(), rr, None);
}
// register a suspend/resume listener
let sr_cid = xous::connect(sid).expect("couldn't create suspend callback connection");
let mut susres = susres::Susres::new(&xns, Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object");
let screen_clip = Rectangle::new(Point::new(0,0), display.screen_size());
display.redraw();
@ -96,6 +100,11 @@ fn xmain() -> ! {
let mut msg = xous::receive_message(sid).unwrap();
log::trace!("Message: {:?}", msg);
match FromPrimitive::from_usize(msg.body.id()) {
Some(Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
display.suspend();
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
display.resume();
}),
Some(Opcode::DrawClipObject) => {
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
let obj = buffer.to_original::<ClipObject, _>().unwrap();

View file

@ -13,6 +13,7 @@ xous = {path = "../../xous-rs"}
xous-ipc = {path = "../../xous-ipc"}
xous-names = {path = "../xous-names"}
llio = {path = "../llio"}
susres = {path = "../susres"}
heapless = "0.5.6"

View file

@ -182,6 +182,9 @@ pub(crate) enum Opcode {
/// used to turn keyboard vibrate on and off
Vibe,
/// Suspend/resume callback
SuspendResume,
}
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]

View file

@ -156,7 +156,7 @@ fn map_qwerty(code: RowCol) -> ScanCode {
(6, 4) => ScanCode{key: Some('↑'), shift: Some('↑'), hold: None, alt: Some('↑')},
(8, 2) => ScanCode{key: Some('↓'), shift: Some('↓'), hold: None, alt: Some('↓')},
// this one is OK
(3, 6) => ScanCode{key: Some('∴'), shift: Some('∴'), hold: None, alt: Some('∴')},
(5, 2) => ScanCode{key: Some('∴'), shift: Some('∴'), hold: None, alt: Some('∴')},
_ => ScanCode {key: None, shift: None, hold: None, alt: None}
}
@ -170,6 +170,7 @@ mod implementation {
use ticktimer_server::Ticktimer;
use xous::CID;
use num_traits::ToPrimitive;
use susres::{RegManager, RegOrField, SuspendResume};
use heapless::Vec;
use heapless::consts::*;
@ -213,6 +214,7 @@ mod implementation {
chord_active: u32,
/// indicate if the chord has been captured. Once captured, further presses are ignored, until all keys are let up.
chord_captured: bool,
susres: RegManager::<{utra::keyboard::KEYBOARD_NUMREGS}>,
}
fn handle_kbd(_irq_no: usize, arg: *mut usize) {
@ -266,6 +268,7 @@ mod implementation {
chord: [[false; KBD_COLS]; KBD_ROWS],
chord_active: 0,
chord_captured: false,
susres: RegManager::new(csr.as_mut_ptr() as *mut u32),
};
xous::claim_interrupt(
@ -281,9 +284,20 @@ mod implementation {
);
log::trace!("hardware initialized");
kbd.susres.push_fixed_value(RegOrField::Reg(utra::keyboard::EV_PENDING), 0xFFFF_FFFF);
kbd.susres.push(RegOrField::Reg(utra::keyboard::EV_ENABLE), None);
kbd
}
pub fn suspend(&mut self) {
self.susres.suspend();
self.csr.wo(utra::keyboard::EV_ENABLE, 0);
}
pub fn resume(&mut self) {
self.susres.resume();
}
pub fn set_map(&mut self, map: KeyMap) {
self.map = map;
}
@ -756,6 +770,10 @@ mod implementation {
chord_interval: 50,
}
}
pub fn suspend(&self) {
}
pub fn resume(&self) {
}
pub fn set_map(&mut self, map: KeyMap) {
self.map = map;
@ -814,6 +832,10 @@ fn xmain() -> ! {
// Create a new kbd object
let mut kbd = Keyboard::new(kbd_sid);
// register a suspend/resume listener
let sr_cid = xous::connect(kbd_sid).expect("couldn't create suspend callback connection");
let mut susres = susres::Susres::new(&xns, Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object");
let mut normal_conns: [Option<CID>; 16] = [None; 16];
let mut raw_conns: [Option<CID>; 16] = [None; 16];
@ -825,6 +847,11 @@ fn xmain() -> ! {
let msg = xous::receive_message(kbd_sid).unwrap(); // this blocks until we get a message
log::trace!("Message: {:?}", msg);
match FromPrimitive::from_usize(msg.body.id()) {
Some(Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
kbd.suspend();
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
kbd.resume();
}),
Some(Opcode::Vibe) => msg_scalar_unpack!(msg, ena, _, _, _, {
if ena != 0 { vibe = true }
else { vibe = false }

View file

@ -67,6 +67,11 @@ impl XousLoggerBacking<'_> {
self.buffer.rewrite(lr).unwrap();
self.buffer.lend(self.conn, 0).unwrap(); // there is only one type of buffer we should be sending!
}
fn resume(&self) {
xous::send_message(self.conn,
xous::Message::new_scalar(2000, 0, 0, 0, 0) // logger is one of the few servers that uses special, non-encoded message IDs.
).expect("couldn't send resume message to the logger implementation");
}
}
impl log::Log for XousLogger {
@ -121,3 +126,7 @@ pub fn init_wait() -> Result<(), log::SetLoggerError> {
log::set_max_level(log::LevelFilter::Info);
Ok(())
}
pub fn resume() {
unsafe { XOUS_LOGGER_BACKING.as_mut().unwrap().resume() };
}

View file

@ -229,6 +229,10 @@ fn handle_scalar(
}
}
1200 => writeln!(output, "Terminating process").unwrap(),
2000 => {
crate::debug::DEFAULT.enable_rx();
writeln!(output, "Resuming logger").unwrap();
},
_ => writeln!(
output,
"Unrecognized scalar message from {}: {:#?}",

View file

@ -21,6 +21,7 @@ xous = {path = "../../xous-rs"}
xous-ipc = {path = "../../xous-ipc"}
xous-names = {path = "../xous-names"}
keyboard = {path = "../keyboard"}
susres = {path = "../susres"}
num-derive = {version = "0.3", default-features = false}
num-traits = {version = "0.2", default-features = false}

View file

@ -4,12 +4,14 @@ use xous_ipc::String;
#[derive(Debug)]
pub struct Sleep {
rtc: rtc::Rtc,
susres: susres::Susres,
}
impl Sleep {
pub fn new(xns: &xous_names::XousNames) -> Self {
let rtc = rtc::Rtc::new(&xns).unwrap();
Sleep {
rtc,
susres: susres::Susres::new_without_hook(&xns).unwrap(),
}
}
}
@ -45,7 +47,7 @@ impl<'a> ShellCmdApi<'a> for Sleep {
use core::fmt::Write;
let mut ret = String::<1024>::new();
let helpstring = "sleep [now] [current] [ship] [kill] [coldboot] [killbounce]";
let helpstring = "sleep [now] [current] [ship] [kill] [coldboot] [killbounce] [sus]";
let mut tokens = args.as_str().unwrap().split(' ');
@ -58,6 +60,11 @@ impl<'a> ShellCmdApi<'a> for Sleep {
if let Some(sub_cmd) = tokens.next() {
match sub_cmd {
"sus" => {
self.susres.initiate_suspend().unwrap();
// the message below is sent after we wake up
write!(ret, "Resumed from sleep!").unwrap();
}
"now" => {
if ((env.llio.adc_vbus().unwrap() as f64) * 0.005033) > 1.5 {
// if power is plugged in, deny powerdown request

View file

@ -74,16 +74,12 @@ pub struct ManagedReg {
pub fixed_value: bool,
}
//#[derive(Debug)]
#[derive(Debug)]
#[allow(dead_code)]
#[cfg(target_os = "none")]
pub struct RegManager<const N: usize> {
pub csr: CSR<u32>,
pub registers: [Option<ManagedReg>; N],
pub sus_prologue: Option<fn(&mut Self)>,
pub sus_epilogue: Option<fn(&mut Self)>,
pub res_prologue: Option<fn(&mut Self)>,
pub res_epilogue: Option<fn(&mut Self)>,
}
#[allow(dead_code)]
#[cfg(target_os = "none")]
@ -92,10 +88,6 @@ impl<const N: usize> RegManager::<N> where ManagedReg: core::marker::Copy {
RegManager::<N> {
csr: CSR::new(reg_base),
registers: [None; N],
sus_prologue: None,
sus_epilogue: None,
res_prologue: None,
res_epilogue: None,
}
}
pub fn push_fixed_value(&mut self, mr: RegOrField, value: usize) {
@ -140,9 +132,6 @@ pub trait SuspendResume {
#[cfg(target_os = "none")]
impl<const N: usize> SuspendResume for RegManager<N> {
fn suspend(&mut self) {
if let Some(sp) = self.sus_prologue {
sp(self);
}
for entry in self.registers.iter_mut().rev() {
if let Some(reg) = entry {
if !reg.fixed_value {
@ -160,14 +149,8 @@ impl<const N: usize> SuspendResume for RegManager<N> {
for entry in self.registers.iter().rev() {
log::trace!("suspend: {:?}", entry);
}*/
if let Some(se) = self.sus_epilogue {
se(self);
}
}
fn resume(&mut self) {
if let Some(rp) = self.res_prologue {
rp(self);
}
for entry in self.registers.iter() { // this is in reverse order to the suspend
if let Some(reg) = entry {
if let Some(mut value) = reg.value {
@ -186,9 +169,6 @@ impl<const N: usize> SuspendResume for RegManager<N> {
for entry in self.registers.iter() {
log::trace!("resume: {:?}", entry);
}*/
if let Some(re) = self.res_epilogue {
re(self);
}
}
}
@ -199,17 +179,26 @@ pub struct ManagedMem<const N: usize> {
pub mem: xous::MemoryRange,
pub backing: [u32; N],
}
#[allow(dead_code)]
impl<const N: usize> ManagedMem<N> {
pub fn new(src: xous::MemoryRange) -> Self {
ManagedMem {
mem: src,
backing: [0; N],
}
}
}
#[cfg(target_os = "none")]
impl<const N: usize> SuspendResume for ManagedMem<N> {
fn suspend(&mut self) {
let src = self.mem.as_ptr() as *const u32;
for words in 0..self.mem.len() {
for words in 0..(self.mem.len() / core::mem::size_of::<u32>()) {
self.backing[words] = unsafe{src.add(words).read_volatile()};
}
}
fn resume(&mut self) {
let dst = self.mem.as_ptr() as *mut u32;
for words in 0..self.mem.len() {
for words in 0..(self.mem.len() / core::mem::size_of::<u32>()) {
unsafe{dst.add(words).write_volatile(self.backing[words])};
}
}

View file

@ -7,6 +7,7 @@ use xous::{send_message, CID, Message, msg_scalar_unpack};
use xous_ipc::Buffer;
use num_traits::{ToPrimitive, FromPrimitive};
#[derive(Debug)]
pub struct Susres {
conn: CID,
suspend_cb_sid: Option<xous::SID>,

View file

@ -72,7 +72,7 @@ mod implementation {
if sr.csr.rf(utra::susres::STATE_RESUME) == 0 {
println!("going into suspend");
if true { // this is just for testing, doing a quick full-soc boot instead of a power down
if false { // this is just for testing, doing a quick full-soc boot instead of a power down
let mut reboot_csr = CSR::new(REBOOT_CSR.load(Ordering::Relaxed) as *mut u32);
reboot_csr.wfo(utra::reboot::SOC_RESET_SOC_RESET, 0xAC);
}
@ -588,6 +588,7 @@ fn xmain() -> ! {
susres_hw.do_suspend(false);
// when do_suspend() returns, it means we've resumed
suspend_requested = false;
log_server::resume(); // log server is a special case, in order to avoid circular dependencies
if susres_hw.do_resume() {
log::error!("We did a clean shut-down, but bootloader is saying previous suspend was forced. Some peripherals may be in an unclean state!");
}
@ -628,6 +629,7 @@ fn xmain() -> ! {
susres_hw.do_suspend(true);
// when do_suspend() returns, it means we've resumed
suspend_requested = false;
log_server::resume(); // log server is a special case, in order to avoid circular dependencies
if susres_hw.do_resume() {
log::error!("We forced a suspend, some peripherals may be in an unclean state!");
} else {