From 640ddb48e824b00de4a71ad8dc942f7e0e52cb22 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 30 Apr 2021 19:29:36 +0800 Subject: [PATCH] suspend/resume now works to hardware --- kernel/assemble.sh | 0 kernel/bin/riscv32i-unknown-none-elf.a | Bin 8558 -> 9078 bytes kernel/bin/riscv32imac-unknown-none-elf.a | Bin 8374 -> 8886 bytes kernel/bin/riscv32imc-unknown-none-elf.a | Bin 8374 -> 8886 bytes kernel/bin/riscv64gc-unknown-none-elf.a | Bin 13414 -> 14254 bytes kernel/bin/riscv64imac-unknown-none-elf.a | Bin 13414 -> 14254 bytes kernel/src/arch/riscv/exception.rs | 2 +- kernel/src/arch/riscv/irq.rs | 14 +++++++++----- kernel/src/asm.S | 22 ++++++++++++++++++++++ kernel/src/irq.rs | 2 +- kernel/src/main.rs | 2 ++ kernel/src/services.rs | 1 + loader/src/main.rs | 15 ++++++++++++++- services/rkyv-test-client/src/main.rs | 2 +- services/susres/Cargo.toml | 2 +- services/susres/src/main.rs | 7 +++++-- services/ticktimer-server/src/main.rs | 14 ++++++++++++-- 17 files changed, 69 insertions(+), 14 deletions(-) mode change 100644 => 100755 kernel/assemble.sh diff --git a/kernel/assemble.sh b/kernel/assemble.sh old mode 100644 new mode 100755 diff --git a/kernel/bin/riscv32i-unknown-none-elf.a b/kernel/bin/riscv32i-unknown-none-elf.a index 97fefeff0790858735f659c5b4e75011ddb4b2da..14a3be90c8c64e5d97eeb334fb461733bf21445b 100644 GIT binary patch literal 9078 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 LdlCb*qTD|LLOg(e diff --git a/kernel/bin/riscv32imac-unknown-none-elf.a b/kernel/bin/riscv32imac-unknown-none-elf.a index f134e50efa87e2864d7f4b5606a7bb040af12f18..728ee5afb5cb3f4f10ff9b035ebf082cbccfa3f9 100644 GIT binary patch literal 8886 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 DV;{xy literal 8374 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 DV;{xy literal 8374 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 literal 13414 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 literal 13414 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 Result { // #[cfg(feature = "debug-print")] // klog!("switching to pid {}", pid); + println!("switching to pid {}", pid); xous_kernel::rsyscall(xous_kernel::SysCall::SwitchTo(pid, 0)) .expect("couldn't switch to pid"); } diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 4900be416..28d03a6c5 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -532,6 +532,7 @@ impl SystemServices { // Activate the current context arch_process.set_thread(arch::process::IRQ_TID).unwrap(); + // println!("Invoking..."); // Construct the new frame arch::syscall::invoke( arch_process.current_thread_mut(), diff --git a/loader/src/main.rs b/loader/src/main.rs index dff0e4687..0f0418575 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -1100,6 +1100,9 @@ fn boot_sequence(args: KernelArguments, _signature: u32) -> ! { resume_csr.wfo(utra::susres::CONTROL_PAUSE, 1); // ensure that the ticktimer is paused before resuming resume_csr.wfo(utra::susres::EV_ENABLE_SOFT_INT, 1); // ensure that the soft interrupt is enabled for the kernel to kick println!("clean suspend marker found, doing a resume!"); + + // trigger the interrupt; it's not immediately handled, but rather checked later on by the kernel on clean resume + resume_csr.wfo(utra::susres::INTERRUPT_INTERRUPT, 1); // SATP restore is handled by the `start_kernel` assembly pre-amble } @@ -1160,11 +1163,21 @@ fn boot_sequence(args: KernelArguments, _signature: u32) -> ! { for i in 0..7 { println!("0x{:08x}", (*backup_args)[i]); } + let satp = ((*backup_args)[3] as usize) & 0x803F_FFFF | (10 << 22); + //let satp = (*backup_args)[3]; + println!("Adjusting SATP was: 0x{:08x} now: 0x{:08x}", (*backup_args)[3], satp); + + if true { + use utralib::generated::*; + let mut gpio_csr = CSR::new(utra::gpio::HW_GPIO_BASE as *mut u32); + gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 1); // patch us over to a different UART for debug (1=LOG 2=APP, 0=KERENL(default)) + } + start_kernel( (*backup_args)[0] as usize, (*backup_args)[1] as usize, (*backup_args)[2] as usize, - (*backup_args)[3] as usize, + satp as usize, (*backup_args)[4] as usize, (*backup_args)[5] as usize, if (*backup_args)[6] == 0 {false} else {true}, diff --git a/services/rkyv-test-client/src/main.rs b/services/rkyv-test-client/src/main.rs index 6175bdaf0..bfc7c4539 100644 --- a/services/rkyv-test-client/src/main.rs +++ b/services/rkyv-test-client/src/main.rs @@ -76,7 +76,7 @@ fn rkyv_test_client() -> ! { com.req_batt_stats().unwrap(); // let the loop run a bit, then try a suspend - if idx == 2 { + if idx == 0 { // TODO: add a self-wakeup RTC alarm once we're beyond the touch-and-go phase susres.initiate_suspend().unwrap(); } diff --git a/services/susres/Cargo.toml b/services/susres/Cargo.toml index fda9665a0..57d2e7f83 100644 --- a/services/susres/Cargo.toml +++ b/services/susres/Cargo.toml @@ -22,4 +22,4 @@ utralib = { path = "../../utralib"} [features] debugprint = [] -default = [] +default = ["debugprint"] diff --git a/services/susres/src/main.rs b/services/susres/src/main.rs index f5b667d70..1cfdae21e 100644 --- a/services/susres/src/main.rs +++ b/services/susres/src/main.rs @@ -59,6 +59,7 @@ mod implementation { // on a clean suspend then resume, the loader will queue up this interrupt to be the first thing to // run on Xous resume, with a bit in the RESUME register set. fn susres_handler(_irq_no: usize, arg: *mut usize) { + println!("susres handler"); let sr = unsafe{ &mut *(arg as *mut SusResHw) }; // clear the pending interrupt sr.csr.wfo(utra::susres::EV_PENDING_SOFT_INT, 1); @@ -70,7 +71,8 @@ mod implementation { } if sr.csr.rf(utra::susres::STATE_RESUME) == 0 { - { // this is just for testing + println!("going into suspend"); + if false { // this is just for testing let mut reboot_csr = CSR::new(REBOOT_CSR.load(Ordering::Relaxed) as *mut u32); reboot_csr.wfo(utra::reboot::SOC_RESET_SOC_RESET, 0xAC); } @@ -80,6 +82,7 @@ mod implementation { loop {} // block forever here } else { + println!("going into resume"); // this unblocks the threads waiting on the resume SHOULD_RESUME.store(true, Ordering::Relaxed); } @@ -498,7 +501,7 @@ pub fn execution_gate() { match FromPrimitive::from_usize(msg.body.id()) { // the entire purpose of SupendingNow is to block the thread that sent the message, until we're ready to resume. Some(ExecGateOpcode::SuspendingNow) => msg_blocking_scalar_unpack!(msg, _, _, _, _, { - println!("execution gated!"); + println!("checking exec gate:"); while !RESUME_EXEC.load(Ordering::Relaxed) { println!("execution gate active"); xous::yield_slice(); diff --git a/services/ticktimer-server/src/main.rs b/services/ticktimer-server/src/main.rs index 4ea77ae18..c7fa383f8 100644 --- a/services/ticktimer-server/src/main.rs +++ b/services/ticktimer-server/src/main.rs @@ -223,8 +223,7 @@ mod implementation { pub fn schedule_response(&mut self, request: SleepRequest) { let irq_target = request.msec; - #[cfg(feature = "debug-print")] - log::info!( + log::trace!( "setting a response at {} ms (current time: {} ms)", irq_target, self.elapsed_ms() @@ -287,6 +286,16 @@ mod implementation { self.wdt_sr_manager.resume(); self.ticktimer_sr_manager.resume(); + + #[cfg(feature = "watchdog")] + { // do a watchdog reset right away + self.wdt.wfo(utra::wdt::EV_PENDING_SOFT_INT, 1); + self.wdt.wfo(utra::wdt::EV_ENABLE_SOFT_INT, 1); + self.wdt.wfo(utra::wdt::INTERRUPT_INTERRUPT, 1); + } + + log::trace!("ticktimer enable: {}", self.csr.r(utra::ticktimer::EV_ENABLE)); + log::trace!("ticktimer target: {}", self.csr.r(utra::ticktimer::MSLEEP_TARGET0)); } } } @@ -511,6 +520,7 @@ fn xmain() -> ! { //ticktimer.check_wdt(); let msg = xous::receive_message(ticktimer_server).unwrap(); + log::trace!("msg: {:?}", msg); match num_traits::FromPrimitive::from_usize(msg.body.id()) { Some(api::Opcode::ElapsedMs) => { let time = ticktimer.elapsed_ms() as i64;