mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
upgrade TRNG with health tests and reporting facilities
This commit is contained in:
parent
ff5af4d66e
commit
2174ab7677
7 changed files with 1287 additions and 48 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -1723,10 +1723,12 @@ dependencies = [
|
||||||
"log-server",
|
"log-server",
|
||||||
"num-derive",
|
"num-derive",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
|
"rkyv 0.4.3",
|
||||||
"susres",
|
"susres",
|
||||||
"ticktimer-server",
|
"ticktimer-server",
|
||||||
"utralib",
|
"utralib",
|
||||||
"xous",
|
"xous",
|
||||||
|
"xous-ipc",
|
||||||
"xous-names",
|
"xous-names",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
928
precursors/soc.svd
Normal file → Executable file
928
precursors/soc.svd
Normal file → Executable file
File diff suppressed because it is too large
Load diff
BIN
precursors/soc_csr.bin
Normal file → Executable file
BIN
precursors/soc_csr.bin
Normal file → Executable file
Binary file not shown.
|
|
@ -14,6 +14,8 @@ log = "0.4"
|
||||||
num-derive = {version = "0.3", default-features = false}
|
num-derive = {version = "0.3", default-features = false}
|
||||||
num-traits = {version = "0.2", default-features = false}
|
num-traits = {version = "0.2", default-features = false}
|
||||||
susres = {path = "../susres"}
|
susres = {path = "../susres"}
|
||||||
|
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
|
||||||
|
xous-ipc = {path = "../../xous-ipc"}
|
||||||
|
|
||||||
[target.'cfg(not(any(windows,unix)))'.dependencies]
|
[target.'cfg(not(any(windows,unix)))'.dependencies]
|
||||||
utralib = { path = "../../utralib"}
|
utralib = { path = "../../utralib"}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,41 @@
|
||||||
pub(crate) const SERVER_NAME_TRNG: &str = "_TRNG manager_";
|
pub(crate) const SERVER_NAME_TRNG: &str = "_TRNG manager_";
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
|
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Default)]
|
||||||
|
pub struct ExcursionTest {
|
||||||
|
pub min: u16,
|
||||||
|
pub max: u16,
|
||||||
|
}
|
||||||
|
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Default)]
|
||||||
|
pub struct MiniRunsTest {
|
||||||
|
pub run_count: [u16; 5],
|
||||||
|
pub fresh: bool,
|
||||||
|
}
|
||||||
|
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Default)]
|
||||||
|
pub struct NistTests {
|
||||||
|
pub adaptive_b: u16,
|
||||||
|
pub repcount_b: u16,
|
||||||
|
pub fresh: bool,
|
||||||
|
}
|
||||||
|
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Default)]
|
||||||
|
pub struct HealthTests {
|
||||||
|
pub av_excursion: [ExcursionTest; 2],
|
||||||
|
pub av_nist: [NistTests; 2],
|
||||||
|
pub ro_miniruns: [MiniRunsTest; 4],
|
||||||
|
pub ro_nist: [NistTests; 4],
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Default)]
|
||||||
|
pub struct TrngErrors {
|
||||||
|
pub excursion_errs: [Option<ExcursionTest>; 2],
|
||||||
|
pub av_repcount_errs: Option<u8>,
|
||||||
|
pub av_adaptive_errs: Option<u8>,
|
||||||
|
pub ro_repcount_errs: Option<u8>,
|
||||||
|
pub ro_adaptive_errs: Option<u8>,
|
||||||
|
pub kernel_underruns: Option<u16>,
|
||||||
|
pub server_underruns: Option<u16>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
|
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
|
||||||
pub(crate) enum Opcode {
|
pub(crate) enum Opcode {
|
||||||
/// Get one or two 32-bit words of TRNG data
|
/// Get one or two 32-bit words of TRNG data
|
||||||
|
|
@ -9,5 +44,30 @@ pub(crate) enum Opcode {
|
||||||
/// Suspend/resume callback
|
/// Suspend/resume callback
|
||||||
SuspendResume,
|
SuspendResume,
|
||||||
|
|
||||||
|
/// Notification of an error from the interrupt handler
|
||||||
|
ErrorNotification,
|
||||||
|
|
||||||
|
/// Subscribe to error notifications
|
||||||
|
ErrorSubscribe,
|
||||||
|
|
||||||
|
/// Get TRNG health stats
|
||||||
|
HealthStats,
|
||||||
|
|
||||||
|
/// Get Error stats
|
||||||
|
ErrorStats,
|
||||||
|
|
||||||
Quit,
|
Quit,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
|
||||||
|
pub(crate) enum EventCallback {
|
||||||
|
Event,
|
||||||
|
Drop,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)]
|
||||||
|
pub(crate) struct ScalarHook {
|
||||||
|
pub sid: (u32, u32, u32, u32),
|
||||||
|
pub id: u32, // ID of the scalar message to send through (e.g. the discriminant of the Enum on the caller's side API)
|
||||||
|
pub cid: xous::CID, // caller-side connection ID for the scalar message to route to. Created by the caller before hooking.
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,18 +2,21 @@
|
||||||
|
|
||||||
pub mod api;
|
pub mod api;
|
||||||
use xous::{CID, send_message};
|
use xous::{CID, send_message};
|
||||||
use num_traits::ToPrimitive;
|
use num_traits::*;
|
||||||
|
use xous_ipc::Buffer;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Trng {
|
pub struct Trng {
|
||||||
conn: CID,
|
conn: CID,
|
||||||
|
error_sid: Option<xous::SID>,
|
||||||
}
|
}
|
||||||
impl Trng {
|
impl Trng {
|
||||||
pub fn new(xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
|
pub fn new(xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
|
||||||
let conn = xns.request_connection_blocking(api::SERVER_NAME_TRNG).expect("Can't connect to TRNG server");
|
let conn = xns.request_connection_blocking(api::SERVER_NAME_TRNG).expect("Can't connect to TRNG server");
|
||||||
REFCOUNT.store(REFCOUNT.load(Ordering::Relaxed) + 1, Ordering::Relaxed);
|
REFCOUNT.store(REFCOUNT.load(Ordering::Relaxed) + 1, Ordering::Relaxed);
|
||||||
Ok(Trng {
|
Ok(Trng {
|
||||||
conn
|
conn,
|
||||||
|
error_sid: None,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
pub fn get_u32(&self) -> Result<u32, xous::Error> {
|
pub fn get_u32(&self) -> Result<u32, xous::Error> {
|
||||||
|
|
@ -38,6 +41,35 @@ impl Trng {
|
||||||
panic!("unexpected return value: {:#?}", response);
|
panic!("unexpected return value: {:#?}", response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub fn hook_error_callback(&mut self, id: u32, cid: CID) -> Result<(), xous::Error> {
|
||||||
|
if self.error_sid.is_none() {
|
||||||
|
let sid = xous::create_server().unwrap();
|
||||||
|
self.error_sid = Some(sid);
|
||||||
|
let sid_tuple = sid.to_u32();
|
||||||
|
xous::create_thread_4(error_cb_server, sid_tuple.0 as usize, sid_tuple.1 as usize, sid_tuple.2 as usize, sid_tuple.3 as usize).unwrap();
|
||||||
|
let hookdata = api::ScalarHook {
|
||||||
|
sid: sid_tuple,
|
||||||
|
id,
|
||||||
|
cid,
|
||||||
|
};
|
||||||
|
let buf = Buffer::into_buf(hookdata).or(Err(xous::Error::InternalError))?;
|
||||||
|
buf.lend(self.conn, api::Opcode::ErrorSubscribe.to_u32().unwrap()).map(|_|())
|
||||||
|
} else {
|
||||||
|
Err(xous::Error::MemoryInUse) // can't hook it twice
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn get_health_tests(&self) -> Result<api::HealthTests, xous::Error> {
|
||||||
|
let ht = api::HealthTests::default();
|
||||||
|
let mut buf = Buffer::into_buf(ht).or(Err(xous::Error::InternalError))?;
|
||||||
|
buf.lend_mut(self.conn, api::Opcode::HealthStats.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
||||||
|
Ok(buf.to_original().unwrap())
|
||||||
|
}
|
||||||
|
pub fn get_error_stats(&self) -> Result<api::TrngErrors, xous::Error> {
|
||||||
|
let errs = api::TrngErrors::default();
|
||||||
|
let mut buf = Buffer::into_buf(errs).or(Err(xous::Error::InternalError))?;
|
||||||
|
buf.lend_mut(self.conn, api::Opcode::ErrorStats.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
||||||
|
Ok(buf.to_original().unwrap())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
use core::sync::atomic::{AtomicU32, Ordering};
|
use core::sync::atomic::{AtomicU32, Ordering};
|
||||||
|
|
@ -50,3 +82,23 @@ impl Drop for Trng {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn error_cb_server(sid0: usize, sid1: usize, sid2: usize, sid3: usize) {
|
||||||
|
let sid = xous::SID::from_u32(sid0 as u32, sid1 as u32, sid2 as u32, sid3 as u32);
|
||||||
|
loop {
|
||||||
|
let msg = xous::receive_message(sid).unwrap();
|
||||||
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
|
Some(api::EventCallback::Event) => xous::msg_scalar_unpack!(msg, cid, id, _, _, {
|
||||||
|
// directly pass the scalar message onto the CID with the ID memorized in the original hook
|
||||||
|
send_message(cid as u32,
|
||||||
|
xous::Message::new_scalar(id, 0, 0, 0, 0)
|
||||||
|
).unwrap();
|
||||||
|
}),
|
||||||
|
Some(api::EventCallback::Drop) => {
|
||||||
|
break; // this exits the loop and kills the thread
|
||||||
|
}
|
||||||
|
None => (),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
xous::destroy_server(sid).unwrap();
|
||||||
|
}
|
||||||
|
|
@ -2,27 +2,91 @@
|
||||||
#![cfg_attr(target_os = "none", no_main)]
|
#![cfg_attr(target_os = "none", no_main)]
|
||||||
|
|
||||||
mod api;
|
mod api;
|
||||||
|
use api::*;
|
||||||
|
|
||||||
use num_traits::FromPrimitive;
|
use num_traits::*;
|
||||||
|
use xous::CID;
|
||||||
|
use xous_ipc::Buffer;
|
||||||
|
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug)]
|
||||||
|
struct ScalarCallback {
|
||||||
|
server_to_cb_cid: CID,
|
||||||
|
cb_to_client_cid: CID,
|
||||||
|
cb_to_client_id: u32,
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "none")]
|
#[cfg(target_os = "none")]
|
||||||
mod implementation {
|
mod implementation {
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
// use crate::api::*;
|
use crate::api::{ExcursionTest, MiniRunsTest, NistTests, HealthTests, TrngErrors};
|
||||||
use log::info;
|
|
||||||
use susres::{RegManager, RegOrField, SuspendResume};
|
use susres::{RegManager, RegOrField, SuspendResume};
|
||||||
|
use num_traits::*;
|
||||||
|
|
||||||
pub struct Trng {
|
pub struct Trng {
|
||||||
csr: utralib::CSR<u32>,
|
csr: utralib::CSR<u32>,
|
||||||
// TODO: allocate a software buffer for whitened TRNGs
|
|
||||||
susres_manager: RegManager::<{utra::trng_server::TRNG_SERVER_NUMREGS}>, // probably can be reduced to save space?
|
susres_manager: RegManager::<{utra::trng_server::TRNG_SERVER_NUMREGS}>, // probably can be reduced to save space?
|
||||||
|
conn: xous::CID,
|
||||||
|
errors: TrngErrors,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn trng_handler(_irq_no: usize, arg: *mut usize) {
|
||||||
|
let trng = unsafe { &mut *(arg as *mut Trng) };
|
||||||
|
|
||||||
|
let pending = trng.csr.r(utra::trng_server::EV_PENDING);
|
||||||
|
if (pending & trng.csr.ms(utra::trng_server::EV_PENDING_EXCURSION0, 1)) != 0 {
|
||||||
|
trng.errors.excursion_errs[0] = Some(ExcursionTest {
|
||||||
|
min: trng.csr.rf(utra::trng_server::AV_EXCURSION0_LAST_ERR_MIN) as u16,
|
||||||
|
max: trng.csr.rf(utra::trng_server::AV_EXCURSION0_LAST_ERR_MAX) as u16,
|
||||||
|
});
|
||||||
|
trng.csr.rmwf(utra::trng_server::AV_EXCURSION0_CTRL_RESET, 1);
|
||||||
|
}
|
||||||
|
if (pending & trng.csr.ms(utra::trng_server::EV_PENDING_EXCURSION1, 1)) != 0 {
|
||||||
|
trng.errors.excursion_errs[1] = Some(ExcursionTest {
|
||||||
|
min: trng.csr.rf(utra::trng_server::AV_EXCURSION1_LAST_ERR_MIN) as u16,
|
||||||
|
max: trng.csr.rf(utra::trng_server::AV_EXCURSION1_LAST_ERR_MAX) as u16,
|
||||||
|
});
|
||||||
|
trng.csr.rmwf(utra::trng_server::AV_EXCURSION1_CTRL_RESET, 1);
|
||||||
|
}
|
||||||
|
if (pending & trng.csr.ms(utra::trng_server::EV_PENDING_HEALTH, 1)) != 0 {
|
||||||
|
let av_repcount = trng.csr.rf(utra::trng_server::NIST_ERRORS_AV_REPCOUNT);
|
||||||
|
let av_adaptive = trng.csr.rf(utra::trng_server::NIST_ERRORS_AV_ADAPTIVE);
|
||||||
|
let ro_repcount = trng.csr.rf(utra::trng_server::NIST_ERRORS_RO_REPCOUNT);
|
||||||
|
let ro_adaptive = trng.csr.rf(utra::trng_server::NIST_ERRORS_RO_ADAPTIVE);
|
||||||
|
if av_repcount != 0 {
|
||||||
|
trng.errors.av_repcount_errs = Some(av_repcount as u8);
|
||||||
|
}
|
||||||
|
if av_adaptive != 0 {
|
||||||
|
trng.errors.av_adaptive_errs = Some(av_adaptive as u8);
|
||||||
|
}
|
||||||
|
if ro_repcount != 0 {
|
||||||
|
trng.errors.ro_repcount_errs = Some(ro_repcount as u8);
|
||||||
|
}
|
||||||
|
if ro_adaptive != 0 {
|
||||||
|
trng.errors.ro_adaptive_errs = Some(ro_adaptive as u8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (pending & trng.csr.ms(utra::trng_server::EV_PENDING_ERROR, 1)) != 0 {
|
||||||
|
if trng.csr.rf(utra::trng_server::UNDERRUNS_SERVER_UNDERRUN) != 0 {
|
||||||
|
trng.errors.server_underruns = Some(trng.csr.rf(utra::trng_server::UNDERRUNS_SERVER_UNDERRUN) as u16);
|
||||||
|
}
|
||||||
|
if trng.csr.rf(utra::trng_server::UNDERRUNS_KERNEL_UNDERRUN) != 0 {
|
||||||
|
trng.errors.kernel_underruns = Some(trng.csr.rf(utra::trng_server::UNDERRUNS_KERNEL_UNDERRUN) as u16);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// reset any error flags
|
||||||
|
trng.csr.rmwf(utra::trng_server::CONTROL_CLR_ERR, 1);
|
||||||
|
// clear the pending interrupt(s)
|
||||||
|
trng.csr.wo(utra::trng_server::EV_PENDING, pending);
|
||||||
|
|
||||||
|
// notify the main loop of the error condition
|
||||||
|
xous::try_send_message(trng.conn,
|
||||||
|
xous::Message::new_scalar(crate::api::Opcode::ErrorNotification.to_usize().unwrap(), 0, 0, 0, 0)).map(|_|()).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Trng {
|
impl Trng {
|
||||||
pub fn new() -> Trng {
|
pub fn new(xns: &xous_names::XousNames) -> Trng {
|
||||||
let csr = xous::syscall::map_memory(
|
let csr = xous::syscall::map_memory(
|
||||||
xous::MemoryAddress::new(utra::trng_server::HW_TRNG_SERVER_BASE),
|
xous::MemoryAddress::new(utra::trng_server::HW_TRNG_SERVER_BASE),
|
||||||
None,
|
None,
|
||||||
|
|
@ -33,7 +97,17 @@ mod implementation {
|
||||||
|
|
||||||
let mut trng = Trng {
|
let mut trng = Trng {
|
||||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||||
|
conn: xns.request_connection_blocking(crate::api::SERVER_NAME_TRNG).unwrap(),
|
||||||
susres_manager: RegManager::new(csr.as_mut_ptr() as *mut u32),
|
susres_manager: RegManager::new(csr.as_mut_ptr() as *mut u32),
|
||||||
|
errors: TrngErrors {
|
||||||
|
excursion_errs: [None; 2],
|
||||||
|
av_repcount_errs: None,
|
||||||
|
av_adaptive_errs: None,
|
||||||
|
ro_repcount_errs: None,
|
||||||
|
ro_adaptive_errs: None,
|
||||||
|
kernel_underruns: None,
|
||||||
|
server_underruns: None,
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
///// configure power settings and which generator to use
|
///// configure power settings and which generator to use
|
||||||
|
|
@ -94,7 +168,29 @@ mod implementation {
|
||||||
);
|
);
|
||||||
trng.susres_manager.push(RegOrField::Reg(utra::trng_server::RO_CONFIG), None);
|
trng.susres_manager.push(RegOrField::Reg(utra::trng_server::RO_CONFIG), None);
|
||||||
|
|
||||||
info!("hardware initialized");
|
// handle error interrupts
|
||||||
|
xous::claim_interrupt(
|
||||||
|
utra::trng_server::TRNG_SERVER_IRQ,
|
||||||
|
trng_handler,
|
||||||
|
(&mut trng) as *mut Trng as *mut usize,
|
||||||
|
)
|
||||||
|
.expect("couldn't claim audio irq");
|
||||||
|
trng.csr.wo(utra::trng_server::EV_PENDING,
|
||||||
|
trng.csr.ms(utra::trng_server::EV_PENDING_ERROR, 1)
|
||||||
|
| trng.csr.ms(utra::trng_server::EV_PENDING_HEALTH, 1)
|
||||||
|
| trng.csr.ms(utra::trng_server::EV_PENDING_EXCURSION0, 1)
|
||||||
|
| trng.csr.ms(utra::trng_server::EV_PENDING_EXCURSION1, 1)
|
||||||
|
);
|
||||||
|
trng.csr.wo(utra::trng_server::EV_ENABLE,
|
||||||
|
trng.csr.ms(utra::trng_server::EV_ENABLE_ERROR, 1)
|
||||||
|
| trng.csr.ms(utra::trng_server::EV_ENABLE_HEALTH, 1)
|
||||||
|
| trng.csr.ms(utra::trng_server::EV_ENABLE_EXCURSION0, 1)
|
||||||
|
| trng.csr.ms(utra::trng_server::EV_ENABLE_EXCURSION1, 1)
|
||||||
|
);
|
||||||
|
trng.susres_manager.push_fixed_value(RegOrField::Reg(utra::trng_server::EV_PENDING), 0xFFFF_FFFF);
|
||||||
|
trng.susres_manager.push(RegOrField::Reg(utra::trng_server::EV_ENABLE), None);
|
||||||
|
|
||||||
|
log::debug!("hardware initialized");
|
||||||
|
|
||||||
trng
|
trng
|
||||||
}
|
}
|
||||||
|
|
@ -104,6 +200,101 @@ mod implementation {
|
||||||
self.csr.base
|
self.csr.base
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_errors(&self) -> TrngErrors {
|
||||||
|
self.errors
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_tests(&self) -> HealthTests {
|
||||||
|
HealthTests {
|
||||||
|
av_excursion: [
|
||||||
|
ExcursionTest {
|
||||||
|
min: self.csr.rf(utra::trng_server::AV_EXCURSION0_STAT_MIN) as u16,
|
||||||
|
max: self.csr.rf(utra::trng_server::AV_EXCURSION0_STAT_MAX) as u16,
|
||||||
|
},
|
||||||
|
ExcursionTest {
|
||||||
|
min: self.csr.rf(utra::trng_server::AV_EXCURSION1_STAT_MIN) as u16,
|
||||||
|
max: self.csr.rf(utra::trng_server::AV_EXCURSION1_STAT_MAX) as u16,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
av_nist: [
|
||||||
|
NistTests {
|
||||||
|
adaptive_b: self.csr.rf(utra::trng_server::NIST_AV_STAT0_ADAP_B) as u16,
|
||||||
|
repcount_b: self.csr.rf(utra::trng_server::NIST_AV_STAT0_REP_B) as u16,
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::NIST_AV_STAT0_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
NistTests {
|
||||||
|
adaptive_b: self.csr.rf(utra::trng_server::NIST_AV_STAT1_ADAP_B) as u16,
|
||||||
|
repcount_b: self.csr.rf(utra::trng_server::NIST_AV_STAT1_REP_B) as u16,
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::NIST_AV_STAT1_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
ro_miniruns: [
|
||||||
|
MiniRunsTest {
|
||||||
|
run_count: [
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN0_COUNT1) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN0_COUNT2) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN0_COUNT3) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN0_COUNT4) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN0_COUNT5) as u16,
|
||||||
|
],
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::RO_RUN0_FRESH_RO_RUN0_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
MiniRunsTest {
|
||||||
|
run_count: [
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN1_COUNT1) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN1_COUNT2) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN1_COUNT3) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN1_COUNT4) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN1_COUNT5) as u16,
|
||||||
|
],
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::RO_RUN1_FRESH_RO_RUN1_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
MiniRunsTest {
|
||||||
|
run_count: [
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN2_COUNT1) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN2_COUNT2) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN2_COUNT3) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN2_COUNT4) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN2_COUNT5) as u16,
|
||||||
|
],
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::RO_RUN2_FRESH_RO_RUN2_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
MiniRunsTest {
|
||||||
|
run_count: [
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN3_COUNT1) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN3_COUNT2) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN3_COUNT3) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN3_COUNT4) as u16,
|
||||||
|
self.csr.r(utra::trng_server::RO_RUN3_COUNT5) as u16,
|
||||||
|
],
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::RO_RUN3_FRESH_RO_RUN3_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
ro_nist: [
|
||||||
|
NistTests {
|
||||||
|
adaptive_b: self.csr.rf(utra::trng_server::NIST_RO_STAT0_ADAP_B) as u16,
|
||||||
|
repcount_b: self.csr.rf(utra::trng_server::NIST_RO_STAT0_REP_B) as u16,
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::NIST_RO_STAT0_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
NistTests {
|
||||||
|
adaptive_b: self.csr.rf(utra::trng_server::NIST_RO_STAT1_ADAP_B) as u16,
|
||||||
|
repcount_b: self.csr.rf(utra::trng_server::NIST_RO_STAT1_REP_B) as u16,
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::NIST_RO_STAT1_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
NistTests {
|
||||||
|
adaptive_b: self.csr.rf(utra::trng_server::NIST_RO_STAT1_ADAP_B) as u16,
|
||||||
|
repcount_b: self.csr.rf(utra::trng_server::NIST_RO_STAT1_REP_B) as u16,
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::NIST_RO_STAT1_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
NistTests {
|
||||||
|
adaptive_b: self.csr.rf(utra::trng_server::NIST_RO_STAT1_ADAP_B) as u16,
|
||||||
|
repcount_b: self.csr.rf(utra::trng_server::NIST_RO_STAT1_REP_B) as u16,
|
||||||
|
fresh: if self.csr.rf(utra::trng_server::NIST_RO_STAT1_FRESH) == 0 {false} else {true},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_data_eager(&self) -> u32 {
|
pub fn get_data_eager(&self) -> u32 {
|
||||||
while self.csr.rf(utra::trng_server::STATUS_AVAIL) == 0 {
|
while self.csr.rf(utra::trng_server::STATUS_AVAIL) == 0 {
|
||||||
xous::yield_slice();
|
xous::yield_slice();
|
||||||
|
|
@ -193,6 +384,20 @@ mod implementation {
|
||||||
}
|
}
|
||||||
pub fn resume(&self) {
|
pub fn resume(&self) {
|
||||||
}
|
}
|
||||||
|
pub fn get_tests(&self) -> HealthTests {
|
||||||
|
HealthTests::default()
|
||||||
|
}
|
||||||
|
pub fn get_errors(&self) -> TrngErrors {
|
||||||
|
TrngErrors {
|
||||||
|
excursion_errs: [None; 2],
|
||||||
|
av_repcount_errs: None,
|
||||||
|
av_adaptive_errs: None,
|
||||||
|
ro_repcount_errs: None,
|
||||||
|
ro_adaptive_errs: None,
|
||||||
|
kernel_underruns: None,
|
||||||
|
server_underruns: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -368,7 +573,7 @@ fn xmain() -> ! {
|
||||||
let trng_sid = xns.register_name(api::SERVER_NAME_TRNG).expect("can't register server");
|
let trng_sid = xns.register_name(api::SERVER_NAME_TRNG).expect("can't register server");
|
||||||
log::trace!("registered with NS -- {:?}", trng_sid);
|
log::trace!("registered with NS -- {:?}", trng_sid);
|
||||||
|
|
||||||
let mut trng = Trng::new();
|
let mut trng = Trng::new(&xns);
|
||||||
|
|
||||||
#[cfg(feature = "avalanchetest")]
|
#[cfg(feature = "avalanchetest")]
|
||||||
log::info!("TRNG built with avalanche test enabled");
|
log::info!("TRNG built with avalanche test enabled");
|
||||||
|
|
@ -387,8 +592,9 @@ fn xmain() -> ! {
|
||||||
let sr_cid = xous::connect(trng_sid).expect("couldn't create suspend callback connection");
|
let sr_cid = xous::connect(trng_sid).expect("couldn't create suspend callback connection");
|
||||||
let mut susres = susres::Susres::new(&xns, api::Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object");
|
let mut susres = susres::Susres::new(&xns, api::Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object");
|
||||||
|
|
||||||
|
let mut error_cb_conns: [Option<ScalarCallback>; 32] = [None; 32];
|
||||||
loop {
|
loop {
|
||||||
let msg = xous::receive_message(trng_sid).unwrap();
|
let mut msg = xous::receive_message(trng_sid).unwrap();
|
||||||
match FromPrimitive::from_usize(msg.body.id()) {
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
Some(api::Opcode::GetTrng) => xous::msg_blocking_scalar_unpack!(msg, count, _, _, _, {
|
Some(api::Opcode::GetTrng) => xous::msg_blocking_scalar_unpack!(msg, count, _, _, _, {
|
||||||
let val: [u32; 2] = trng.get_trng(count);
|
let val: [u32; 2] = trng.get_trng(count);
|
||||||
|
|
@ -400,6 +606,23 @@ fn xmain() -> ! {
|
||||||
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
|
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
|
||||||
trng.resume();
|
trng.resume();
|
||||||
}),
|
}),
|
||||||
|
Some(api::Opcode::ErrorSubscribe) => {
|
||||||
|
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
|
||||||
|
let hookdata = buffer.to_original::<api::ScalarHook, _>().unwrap();
|
||||||
|
do_hook(hookdata, &mut error_cb_conns);
|
||||||
|
},
|
||||||
|
Some(api::Opcode::ErrorNotification) => {
|
||||||
|
log::error!("Got an error condition in the TRNG. Syndrome: {:?}", trng.get_errors());
|
||||||
|
send_event(&error_cb_conns);
|
||||||
|
},
|
||||||
|
Some(api::Opcode::HealthStats) => {
|
||||||
|
let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) };
|
||||||
|
buffer.replace(trng.get_tests()).unwrap();
|
||||||
|
},
|
||||||
|
Some(api::Opcode::ErrorStats) => {
|
||||||
|
let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) };
|
||||||
|
buffer.replace(trng.get_errors()).unwrap();
|
||||||
|
},
|
||||||
Some(api::Opcode::Quit) => {
|
Some(api::Opcode::Quit) => {
|
||||||
break
|
break
|
||||||
},
|
},
|
||||||
|
|
@ -410,8 +633,54 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
// clean up our program
|
// clean up our program
|
||||||
log::trace!("main loop exit, destroying servers");
|
log::trace!("main loop exit, destroying servers");
|
||||||
|
unhook(&mut error_cb_conns);
|
||||||
xns.unregister_server(trng_sid).unwrap();
|
xns.unregister_server(trng_sid).unwrap();
|
||||||
xous::destroy_server(trng_sid).unwrap();
|
xous::destroy_server(trng_sid).unwrap();
|
||||||
log::trace!("quitting");
|
log::trace!("quitting");
|
||||||
xous::terminate_process(0)
|
xous::terminate_process(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fn do_hook(hookdata: ScalarHook, cb_conns: &mut [Option<ScalarCallback>; 32]) {
|
||||||
|
let (s0, s1, s2, s3) = hookdata.sid;
|
||||||
|
let sid = xous::SID::from_u32(s0, s1, s2, s3);
|
||||||
|
let server_to_cb_cid = xous::connect(sid).unwrap();
|
||||||
|
let cb_dat = Some(ScalarCallback {
|
||||||
|
server_to_cb_cid,
|
||||||
|
cb_to_client_cid: hookdata.cid,
|
||||||
|
cb_to_client_id: hookdata.id,
|
||||||
|
});
|
||||||
|
let mut found = false;
|
||||||
|
for entry in cb_conns.iter_mut() {
|
||||||
|
if entry.is_none() {
|
||||||
|
*entry = cb_dat;
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
log::error!("ran out of space registering callback");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn unhook(cb_conns: &mut [Option<ScalarCallback>; 32]) {
|
||||||
|
for entry in cb_conns.iter_mut() {
|
||||||
|
if let Some(scb) = entry {
|
||||||
|
xous::send_message(scb.server_to_cb_cid,
|
||||||
|
xous::Message::new_blocking_scalar(api::EventCallback::Drop.to_usize().unwrap(), 0, 0, 0, 0)
|
||||||
|
).unwrap();
|
||||||
|
unsafe{xous::disconnect(scb.server_to_cb_cid).unwrap();}
|
||||||
|
}
|
||||||
|
*entry = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn send_event(cb_conns: &[Option<ScalarCallback>; 32]) {
|
||||||
|
for entry in cb_conns.iter() {
|
||||||
|
if let Some(scb) = entry {
|
||||||
|
// note that the "which" argument is only used for GPIO events, to indicate which pin had the event
|
||||||
|
xous::send_message(scb.server_to_cb_cid,
|
||||||
|
xous::Message::new_scalar(api::EventCallback::Event.to_usize().unwrap(),
|
||||||
|
scb.cb_to_client_cid as usize, scb.cb_to_client_id as usize, 0, 0)
|
||||||
|
).unwrap();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue