engine passs tests, but still some issues with power management

This commit is contained in:
bunnie 2021-06-25 04:40:06 +08:00
parent 6825e2e7e8
commit 1d274e4d7c
3 changed files with 22 additions and 13 deletions

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor>
<name>SOC</name>
<description><![CDATA[Litex SoC 2021-06-24 23:46:35]]></description>
<description><![CDATA[Litex SoC 2021-06-25 04:00:51]]></description>
<addressUnitBits>8</addressUnitBits>
<width>32</width>
@ -3451,7 +3451,7 @@ inject too fast.]]></description>
<name>SEED1</name>
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
<addressOffset>0x0000</addressOffset>
<resetValue>0x3cc42051</resetValue>
<resetValue>0x14b43e4c</resetValue>
<size>32</size>
<fields>
<field>
@ -3466,7 +3466,7 @@ inject too fast.]]></description>
<name>SEED0</name>
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
<addressOffset>0x0004</addressOffset>
<resetValue>0x18543333</resetValue>
<resetValue>0x1841b455</resetValue>
<size>32</size>
<fields>
<field>

Binary file not shown.

View file

@ -246,15 +246,22 @@ mod implementation {
}
}
pub fn power_dbg(&self) -> u32 {
#[allow(dead_code)]
pub(crate) fn power_dbg(&self) -> u32 {
self.csr.r(utra::engine::POWER)
}
pub fn power_on(&mut self, on: bool) {
if on {
self.csr.rmwf(utra::engine::POWER_ON, 1);
} else {
self.csr.rmwf(utra::engine::POWER_ON, 0);
}
}
pub fn run(&mut self, job: Job) {
log::trace!("entering run");
// block any suspends from happening while we set up the engine
DISALLOW_SUSPEND.store(true, Ordering::Relaxed);
log::trace!("power on");
self.csr.rmwf(utra::engine::POWER_ON, 1);
log::trace!("extracting windows");
let window = if let Some(w) = job.window {
@ -314,12 +321,10 @@ mod implementation {
pub fn get_result(&mut self) -> JobResult {
if let Some(clean_resume) = self.clean_resume {
if !clean_resume {
self.csr.rmwf(utra::engine::POWER_ON, 0);
return JobResult::SuspendError;
}
}
if self.illegal_opcode {
self.csr.rmwf(utra::engine::POWER_ON, 0);
return JobResult::IllegalOpcodeException;
}
log::debug!("power: {}", self.csr.rf(utra::engine::POWER_ON));
@ -338,7 +343,6 @@ mod implementation {
num += 1;*/
}
self.csr.rmwf(utra::engine::POWER_ON, 0);
JobResult::Result(ret_rf)
}
}
@ -452,6 +456,7 @@ fn xmain() -> ! {
log::trace!("waiting for suspend to finish");
xous::yield_slice();
}
engine25519.power_on(true);
let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) };
let job = buffer.to_original::<Job, _>().unwrap();
@ -466,17 +471,18 @@ fn xmain() -> ! {
// just let the caller know we started a job, but don't return any results
JobResult::Started
} else {
log::trace!("running sync job {:?}", job);
// log::trace!("running sync job {:?}", job);
// sync job
// start the job, which should set RUN_IN_PROGRESS to true
engine25519.run(job);
while RUN_IN_PROGRESS.load(Ordering::Relaxed) {
log::debug!("power reg: 0x{:x}", engine25519.power_dbg());
// block until the job is done
xous::yield_slice();
}
engine25519.get_result() // return the result
}
let result = engine25519.get_result(); // return the result
engine25519.power_on(false);
result
}
} else {
JobResult::EngineUnavailable
};
@ -500,6 +506,7 @@ fn xmain() -> ! {
} else {
log::error!("illegal state: got a result, but no client was registered. Did we forget to disable interrupts on a synchronous call??");
}
engine25519.power_on(false);
},
Some(Opcode::IllegalOpcode) => {
if let Some(cid) = client_cid {
@ -508,9 +515,11 @@ fn xmain() -> ! {
} else {
log::error!("illegal state: got a result, but no client was registered. Did we forget to disable interrupts on a synchronous call??");
}
engine25519.power_on(false);
}
Some(Opcode::Quit) => {
log::info!("Received quit opcode, exiting!");
engine25519.power_on(false);
break;
}
None => {