mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
fix up bugs in trng hal; automatically reset generator on exhaustion
This commit is contained in:
parent
5df2e27447
commit
75217075c1
1 changed files with 8 additions and 4 deletions
|
|
@ -43,7 +43,7 @@ bitflags! {
|
||||||
const POSTPROC_OPT_RESEED_ALWAYS = 0b0_00_00_000000_10_0_0_0_0;
|
const POSTPROC_OPT_RESEED_ALWAYS = 0b0_00_00_000000_10_0_0_0_0;
|
||||||
const POSTPROC_OPT_RESEED_AUTO = 0b0_00_00_000000_10_0_0_0_0;
|
const POSTPROC_OPT_RESEED_AUTO = 0b0_00_00_000000_10_0_0_0_0;
|
||||||
|
|
||||||
const HEALTHTEST_LEN_POS = 7;
|
const HEALTHTEST_LEN_POS = 6;
|
||||||
const HEALTHTEST_LEN_MASK = 0b0_00_00_111111_00_0_0_0_0;
|
const HEALTHTEST_LEN_MASK = 0b0_00_00_111111_00_0_0_0_0;
|
||||||
const GEN_INTERVAL_MASK = 0b0_00_11_000000_00_0_0_0_0;
|
const GEN_INTERVAL_MASK = 0b0_00_11_000000_00_0_0_0_0;
|
||||||
const GEN_INTERVAL_1 = 0b0_00_00_000000_00_0_0_0_0;
|
const GEN_INTERVAL_1 = 0b0_00_00_000000_00_0_0_0_0;
|
||||||
|
|
@ -100,7 +100,7 @@ impl Trng {
|
||||||
.bits(),
|
.bits(),
|
||||||
);
|
);
|
||||||
// turn on all the analog generators, and declare their outputs valid
|
// turn on all the analog generators, and declare their outputs valid
|
||||||
self.csr.wo(utra::trng::SFR_AR_GEN, (Analog::ENABLE_MASK | Analog::VALID_MASK).bits());
|
self.csr.wo(utra::trng::SFR_CRANA, (Analog::ENABLE_MASK | Analog::VALID_MASK).bits());
|
||||||
// set options
|
// set options
|
||||||
self.csr.wo(
|
self.csr.wo(
|
||||||
utra::trng::SFR_OPT,
|
utra::trng::SFR_OPT,
|
||||||
|
|
@ -111,7 +111,7 @@ impl Trng {
|
||||||
// set configuration options
|
// set configuration options
|
||||||
let healthest_len =
|
let healthest_len =
|
||||||
if count as u32 > (Config::HEALTHTEST_LEN_MASK.bits() >> Config::HEALTHTEST_LEN_POS.bits()) {
|
if count as u32 > (Config::HEALTHTEST_LEN_MASK.bits() >> Config::HEALTHTEST_LEN_POS.bits()) {
|
||||||
Config::HEALTHTEST_LEN_MASK.bits()
|
Config::HEALTHTEST_LEN_MASK.bits() >> Config::HEALTHTEST_LEN_POS.bits()
|
||||||
} else {
|
} else {
|
||||||
count as u32
|
count as u32
|
||||||
};
|
};
|
||||||
|
|
@ -131,7 +131,11 @@ impl Trng {
|
||||||
while self.csr.r(utra::trng::SFR_SR) & Status::BUFREADY.bits() == 0 {}
|
while self.csr.r(utra::trng::SFR_SR) & Status::BUFREADY.bits() == 0 {}
|
||||||
Some(self.csr.r(utra::trng::SFR_BUF))
|
Some(self.csr.r(utra::trng::SFR_BUF))
|
||||||
} else {
|
} else {
|
||||||
None
|
// re-init generation automatically
|
||||||
|
self.setup_raw_generation(256);
|
||||||
|
self.count -= 1;
|
||||||
|
while self.csr.r(utra::trng::SFR_SR) & Status::BUFREADY.bits() == 0 {}
|
||||||
|
Some(self.csr.r(utra::trng::SFR_BUF))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Mode::Lfsr => {
|
Mode::Lfsr => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue