Merge branch 'bunnie-dev' into main

This commit is contained in:
bunnie 2021-10-30 19:15:54 +08:00
commit 3a25578cc4
8 changed files with 68 additions and 39 deletions

View file

@ -1,17 +0,0 @@
REM a crappy starter script to help with builds under Windows environments. ymmv.
cargo xtask hw-image precursors/soc.svd
REM cargo xtask minimal precursors/soc.svd
CertUtil -hashfile precursors/bbram-test1.nky MD5
CertUtil -hashfile precursors/soc_csr.bin MD5
CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/loader.bin MD5
CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/xous.img MD5
scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-xous-elf/release/xous.img target/riscv32imac-unknown-xous-elf/release/loader.bin precursors/soc_csr.bin pi@10.0.245.90:code/precursors/
REM CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/loader.bin MD5
REM CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/xous.img MD5
REM scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-none-elf/release/xous.img target/riscv32imac-unknown-none-elf/release/loader.bin precursors/soc_csr.bin precursors/bbram-test1.nky pi@10.0.245.90:code/precursors/
REM wishbone-tool --load-name target/riscv32imac-unknown-none-elf/release/xous.img --load-address 0x980000 --load-flash

20
buildpush.ps1 Normal file
View file

@ -0,0 +1,20 @@
# a crappy starter script to help with builds under Windows environments. ymmv.
# set RUSTFLAGS=--remap-path-prefix=F:\largework\rust-win\code\xous-core\=build
# $env:RUSTFLAGS="--remap-path-prefix=$(Get-Location)=build"
cargo xtask hw-image precursors/soc.svd
# cargo xtask minimal precursors/soc.svd
CertUtil -hashfile precursors/bbram-test1.nky MD5
CertUtil -hashfile precursors/soc_csr.bin MD5
CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/loader.bin MD5
CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/xous.img MD5
scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-xous-elf/release/xous.img target/riscv32imac-unknown-xous-elf/release/loader.bin precursors/soc_csr.bin pi@10.0.245.90:code/precursors/
# CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/loader.bin MD5
# CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/xous.img MD5
# scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-none-elf/release/xous.img target/riscv32imac-unknown-none-elf/release/loader.bin precursors/soc_csr.bin precursors/bbram-test1.nky pi@10.0.245.90:code/precursors/
# wishbone-tool --load-name target/riscv32imac-unknown-none-elf/release/xous.img --load-address 0x980000 --load-flash

View file

@ -696,13 +696,17 @@ fn xmain() -> ! {
// - rootkeys (for reboots)
// - oqc-test (for testing the vibe motor)
// - net (for COM interrupt dispatch)
// - problem: `sleep killbounce` allocates a connection. That would bring us to 10 normally, but 11 when that function is needed.
// for now we're going to leave the total server count as "None" (open-ended) but we probably want to rethink this as
// the I2C access is in this crate. Perhaps we should split I2C out, so that the RTC can be protected and not grouped
// into the same severe security restrictions as the other LLIO items?
let num_conns = 10;
let llio_sid = xns.register_name(api::SERVER_NAME_LLIO, Some(num_conns)).expect("can't register server");
let llio_sid = xns.register_name(api::SERVER_NAME_LLIO, None).expect("can't register server");
log::trace!("registered with NS -- {:?}", llio_sid);
// create the I2C handler thread
// each connection to llio also creates an i2c connection, so it has the same expectation list
let i2c_sid = xns.register_name(api::SERVER_NAME_I2C, Some(num_conns)).expect("can't register I2C thread");
let i2c_sid = xns.register_name(api::SERVER_NAME_I2C, None).expect("can't register I2C thread");
log::trace!("registered I2C thread with NS -- {:?}", i2c_sid);
let (sid0, sid1, sid2, sid3) = i2c_sid.to_u32();
xous::create_thread_4(i2c_thread, sid0 as usize, sid1 as usize, sid2 as usize, sid3 as usize).expect("couldn't start I2C handler thread");

View file

@ -35,7 +35,7 @@ fn kill_thread(bounce: usize) {
llio.self_destruct(0x2718_2818).unwrap();
llio.self_destruct(0x3141_5926).unwrap();
com.power_off_soc().unwrap();
ticktimer.sleep_ms(100).unwrap();
ticktimer.sleep_ms(1000).unwrap();
log::info!("If you can read this, we failed to destroy ourselves!");
}
}

View file

@ -21,5 +21,6 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
utralib = { path = "../../utralib"}
[features]
sus_reboot = [] # when selected, suspend triggers an immediate reboot instead of suspend. For testing only.
debugprint = []
default = []

View file

@ -53,7 +53,7 @@ mod implementation {
timer.wfo(utra::timer0::EV_PENDING_ZERO, 0b1);
}
// this is just for testing, remove for production
#[cfg(feature = "sus_reboot")]
static REBOOT_CSR: core::sync::atomic::AtomicU32 = core::sync::atomic::AtomicU32::new(0);
// we do all the suspend/resume coordination in an interrupt context
@ -74,7 +74,8 @@ mod implementation {
if sr.csr.rf(utra::susres::STATE_RESUME) == 0 {
//println!("going into suspend");
if false { // this is just for testing, doing a quick full-soc boot instead of a power down
#[cfg(feature = "sus_reboot")]
{ // 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);
}
@ -163,6 +164,7 @@ mod implementation {
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map Reboot CSR range");
#[cfg(feature = "sus_reboot")]
REBOOT_CSR.store(reboot_csr.as_mut_ptr() as u32, Ordering::Relaxed); // for testing only
let mut sr = SusResHw {
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
@ -239,6 +241,7 @@ mod implementation {
}
}
#[cfg(feature = "debugprint")]
println!("Stopping preemption");
// stop pre-emption
self.os_timer.wfo(utra::timer0::EN_EN, 0);
@ -250,6 +253,7 @@ mod implementation {
// ensure that the resume bit is not set
self.csr.wfo(utra::susres::STATE_RESUME, 0);
#[cfg(feature = "debugprint")]
println!("Stopping ticktimer");
// stop deferred thread scheduling, by stopping the ticktimer
self.csr.wfo(utra::susres::CONTROL_PAUSE, 1);
@ -261,6 +265,7 @@ mod implementation {
(self.csr.r(utra::susres::TIME1) as u64) << 32)
+ 0 // a placeholder in case we need to advance time on save
);
#[cfg(feature = "debugprint")]
println!("Stored time: {}", self.stored_time.unwrap());
// setup the clean suspend marker, note if things were forced
@ -339,18 +344,21 @@ mod implementation {
index += range;
}
#[cfg(feature = "debugprint")]
println!("Triggering suspend interrupt");
// trigger an interrupt to process the final suspend bits
self.csr.wfo(utra::susres::INTERRUPT_INTERRUPT, 1);
// SHOULD_RESUME will be set true by the interrupt context when it re-enters from resume
while !SHOULD_RESUME.load(Ordering::Relaxed) {
#[cfg(feature = "debugprint")]
println!("Waiting for resume");
xous::yield_slice();
}
}
pub fn do_resume(&mut self) -> bool { // returns true if the previous suspend was forced
// resume the ticktimer where it left off
#[cfg(feature = "debugprint")]
println!("Trying to resume");
if let Some(time)= self.stored_time.take() {
// zero out the clean-suspend marker
@ -362,6 +370,7 @@ mod implementation {
// restore the ticktimer
self.csr.wo(utra::susres::RESUME_TIME0, time as u32);
self.csr.wo(utra::susres::RESUME_TIME1, (time >> 32) as u32);
#[cfg(feature = "debugprint")]
println!("Ticktimer loaded with {}", time);
// set up pre-emption timer
@ -384,6 +393,7 @@ mod implementation {
log::trace!("Resume {} / control {}", self.csr.r(utra::susres::RESUME_TIME0), self.csr.r(utra::susres::CONTROL));
log::trace!("Ticktimer loaded with {} / {}", time, self.csr.r(utra::susres::TIME0));
self.csr.wo(utra::susres::CONTROL, 0);
#[cfg(feature = "debugprint")]
println!("Ticktimer and OS timer now running");
} else {

View file

@ -582,7 +582,7 @@ impl Tester {
pub fn new(server_csr: *mut u32) -> Tester {
use utralib::generated::*;
let buff_a = xous::syscall::map_memory(
xous::MemoryAddress::new(0x4080_0000), // fix this at a known physical address
xous::MemoryAddress::new(0x40B0_0000), // fix this at a known physical address
None,
crate::TRNG_BUFF_LEN,
xous::MemoryFlags::R | xous::MemoryFlags::W,
@ -590,7 +590,7 @@ impl Tester {
.expect("couldn't map TRNG comms buffer A");
let buff_b = xous::syscall::map_memory(
xous::MemoryAddress::new(0x4090_0000), // fix this at a known physical address
xous::MemoryAddress::new(0x40C0_0000), // fix this at a known physical address
None,
crate::TRNG_BUFF_LEN,
xous::MemoryFlags::R | xous::MemoryFlags::W,

View file

@ -41,8 +41,11 @@ class PrecursorUsb:
wValue=(addr & 0xffff), wIndex=((addr >> 16) & 0xffff),
data_or_wLength=data, timeout=500)
except Exception as e:
self.dev.reset()
time.sleep(2)
try:
self.dev.reset()
except usb.core.USBTimeoutError:
pass
time.sleep(3.0)
else:
break
@ -71,8 +74,11 @@ class PrecursorUsb:
data_or_wLength=data, timeout=500)
except Exception as e:
sys.stderr.write("error; resetting device\n")
self.dev.reset()
time.sleep(2)
try:
self.dev.reset()
except usb.core.USBTimeoutError:
pass
time.sleep(3.0)
else:
break
@ -111,24 +117,29 @@ class PrecursorUsb:
bufsize = maxlen
data = array.array('B', _dummy_s * bufsize)
if self.vexdbg_addr != None:
self.poke(self.vexdbg_addr, 0x00020000)
time.sleep(0.1)
for attempt in range(10):
try:
if self.vexdbg_addr != None:
self.poke(self.vexdbg_addr, 0x00020000)
numread = self.dev.ctrl_transfer(bmRequestType=(0x80 | 0x43), bRequest=0,
wValue=(cur_addr & 0xffff), wIndex=((cur_addr >> 16) & 0xffff),
data_or_wLength=data, timeout=50000)
if self.vexdbg_addr != None:
self.poke(self.vexdbg_addr, 0x02000000)
data_or_wLength=data, timeout=60000)
except Exception as e:
sys.stderr.write("error; resetting device\n")
self.dev.reset()
time.sleep(2)
try:
self.dev.reset()
except:
pass
time.sleep(2.2)
else:
break
else:
sys.stderr.write("Burst read failed\n")
exit(1)
#exit(1)
if self.vexdbg_addr != None:
self.poke(self.vexdbg_addr, 0x02000000)
time.sleep(0.1)
if numread != bufsize:
sys.stderr.write("Burst read error: {} bytes requested, {} bytes read at 0x{:08x}\n".format(bufsize, numread, cur_addr))
@ -292,8 +303,8 @@ def main():
messible2_in = pc_usb.register('messible2_in')
messible_out = pc_usb.register('messible_out')
RAM_A = 0x4080_0000
RAM_B = 0x4090_0000
RAM_A = 0x40B0_0000
RAM_B = 0x40C0_0000
BURST_LEN = 512 * 1024
TIMEOUT = 30.0
@ -313,7 +324,7 @@ def main():
pc_usb.poke(pc_usb.register('reboot_soc_reset'), 0xac, display=False)
except usb.core.USBError:
pass # we expect an error because we reset the SOC and that includes the USB core
time.sleep(2.0)
time.sleep(3.0)
dev = usb.core.find(idProduct=0x5bf0, idVendor=0x1209)
dev.set_configuration()
pc_usb = PrecursorUsb(dev)