diff --git a/emulation/soc/renode.svd b/emulation/soc/renode.svd index 89e26710d..294e8b04d 100644 --- a/emulation/soc/renode.svd +++ b/emulation/soc/renode.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x974ecf35 + 0x15a07b18 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x13 + 0x15 32 @@ -2392,7 +2392,7 @@ register to disable individual events.]]> POWER 0x0000 - 0x0a + 0x20a 32 @@ -2456,12 +2456,64 @@ the host role.]]> + + crypto_on + 9 + [9:9] + 9 + + + + ignore_locked + 10 + [10:10] + 10 + + + + + + CLK_STATUS + 0x0004 + 0x00 + 32 + + + crypto_on + 0 + [0:0] + 0 + + + + sha_on + 1 + [1:1] + 1 + + + + engine_on + 2 + [2:2] + 2 + + + + btpower_on + 3 + [3:3] + 3 + + VIBE - 0x0004 + 0x0008 0x00 32 @@ -2477,7 +2529,7 @@ reset fashion]]> EV_STATUS - 0x0008 + 0x000c 0x00 32 @@ -2493,7 +2545,7 @@ reset fashion]]> EV_PENDING - 0x000c + 0x0010 0x00 32 @@ -2509,7 +2561,7 @@ reset fashion]]> EV_ENABLE - 0x0010 + 0x0014 0x00 32 @@ -2525,7 +2577,7 @@ reset fashion]]> 0 - 0x14 + 0x18 registers @@ -3117,7 +3169,7 @@ inject too fast.]]> SEED1 0x0000 - 0x229e8191 + 0x3b676dbb 32 @@ -3132,7 +3184,7 @@ inject too fast.]]> SEED0 0x0004 - 0x261d606f + 0x2a12256d 32 @@ -4350,10 +4402,26 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> 0xF001D000 SHA512 + + POWER + 0x0000 + 0x00 + 32 + + + on + 0 + [0:0] + 0 + + + + CONFIG - 0x0000 + 0x0004 0x00 32 @@ -4390,7 +4458,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> COMMAND - 0x0004 + 0x0008 0x00 32 @@ -4413,7 +4481,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST01 - 0x0008 + 0x000c 0x00 32 @@ -4428,7 +4496,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST00 - 0x000c + 0x0010 0x00 32 @@ -4443,7 +4511,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST11 - 0x0010 + 0x0014 0x00 32 @@ -4458,7 +4526,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST10 - 0x0014 + 0x0018 0x00 32 @@ -4473,7 +4541,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST21 - 0x0018 + 0x001c 0x00 32 @@ -4488,7 +4556,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST20 - 0x001c + 0x0020 0x00 32 @@ -4503,7 +4571,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST31 - 0x0020 + 0x0024 0x00 32 @@ -4518,7 +4586,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST30 - 0x0024 + 0x0028 0x00 32 @@ -4533,7 +4601,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST41 - 0x0028 + 0x002c 0x00 32 @@ -4548,7 +4616,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST40 - 0x002c + 0x0030 0x00 32 @@ -4563,7 +4631,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST51 - 0x0030 + 0x0034 0x00 32 @@ -4578,7 +4646,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST50 - 0x0034 + 0x0038 0x00 32 @@ -4593,7 +4661,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST61 - 0x0038 + 0x003c 0x00 32 @@ -4608,7 +4676,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST60 - 0x003c + 0x0040 0x00 32 @@ -4623,7 +4691,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST71 - 0x0040 + 0x0044 0x00 32 @@ -4638,7 +4706,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST70 - 0x0044 + 0x0048 0x00 32 @@ -4654,7 +4722,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> MSG_LENGTH1 - 0x0048 + 0x004c 0x00 32 @@ -4669,7 +4737,7 @@ in bits]]> MSG_LENGTH0 - 0x004c + 0x0050 0x00 32 @@ -4684,7 +4752,7 @@ in bits]]> EV_STATUS - 0x0050 + 0x0054 0x00 32 @@ -4714,7 +4782,7 @@ in bits]]> EV_PENDING - 0x0054 + 0x0058 0x00 32 @@ -4744,7 +4812,7 @@ in bits]]> EV_ENABLE - 0x0058 + 0x005c 0x00 32 @@ -4774,7 +4842,7 @@ in bits]]> FIFO - 0x005c + 0x0060 0x00 32 @@ -4832,7 +4900,7 @@ in bits]]> 0 - 0x60 + 0x64 registers @@ -4908,10 +4976,26 @@ microcode instructions starting at mpstart]]> - STATUS + POWER 0x0010 0x00 32 + + + on + 0 + [0:0] + 0 + + + + + + STATUS + 0x0014 + 0x00 + 32 running @@ -4933,7 +5017,7 @@ microcode memory areas will stall until this bit is clear]]> EV_STATUS - 0x0014 + 0x0018 0x00 32 @@ -4956,7 +5040,7 @@ microcode memory areas will stall until this bit is clear]]> EV_PENDING - 0x0018 + 0x001c 0x00 32 @@ -4979,7 +5063,7 @@ microcode memory areas will stall until this bit is clear]]> EV_ENABLE - 0x001c + 0x0020 0x00 32 @@ -5003,7 +5087,7 @@ microcode memory areas will stall until this bit is clear]]> INSTRUCTION - 0x0020 + 0x0024 0x00 32 @@ -5061,7 +5145,7 @@ exactly reflects the binary layout of an Engine instruction.]]> 0 - 0x24 + 0x28 registers diff --git a/precursors/soc.svd b/precursors/soc.svd index 89e26710d..294e8b04d 100644 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x974ecf35 + 0x15a07b18 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x13 + 0x15 32 @@ -2392,7 +2392,7 @@ register to disable individual events.]]> POWER 0x0000 - 0x0a + 0x20a 32 @@ -2456,12 +2456,64 @@ the host role.]]> + + crypto_on + 9 + [9:9] + 9 + + + + ignore_locked + 10 + [10:10] + 10 + + + + + + CLK_STATUS + 0x0004 + 0x00 + 32 + + + crypto_on + 0 + [0:0] + 0 + + + + sha_on + 1 + [1:1] + 1 + + + + engine_on + 2 + [2:2] + 2 + + + + btpower_on + 3 + [3:3] + 3 + + VIBE - 0x0004 + 0x0008 0x00 32 @@ -2477,7 +2529,7 @@ reset fashion]]> EV_STATUS - 0x0008 + 0x000c 0x00 32 @@ -2493,7 +2545,7 @@ reset fashion]]> EV_PENDING - 0x000c + 0x0010 0x00 32 @@ -2509,7 +2561,7 @@ reset fashion]]> EV_ENABLE - 0x0010 + 0x0014 0x00 32 @@ -2525,7 +2577,7 @@ reset fashion]]> 0 - 0x14 + 0x18 registers @@ -3117,7 +3169,7 @@ inject too fast.]]> SEED1 0x0000 - 0x229e8191 + 0x3b676dbb 32 @@ -3132,7 +3184,7 @@ inject too fast.]]> SEED0 0x0004 - 0x261d606f + 0x2a12256d 32 @@ -4350,10 +4402,26 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> 0xF001D000 SHA512 + + POWER + 0x0000 + 0x00 + 32 + + + on + 0 + [0:0] + 0 + + + + CONFIG - 0x0000 + 0x0004 0x00 32 @@ -4390,7 +4458,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> COMMAND - 0x0004 + 0x0008 0x00 32 @@ -4413,7 +4481,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST01 - 0x0008 + 0x000c 0x00 32 @@ -4428,7 +4496,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST00 - 0x000c + 0x0010 0x00 32 @@ -4443,7 +4511,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST11 - 0x0010 + 0x0014 0x00 32 @@ -4458,7 +4526,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST10 - 0x0014 + 0x0018 0x00 32 @@ -4473,7 +4541,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST21 - 0x0018 + 0x001c 0x00 32 @@ -4488,7 +4556,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST20 - 0x001c + 0x0020 0x00 32 @@ -4503,7 +4571,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST31 - 0x0020 + 0x0024 0x00 32 @@ -4518,7 +4586,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST30 - 0x0024 + 0x0028 0x00 32 @@ -4533,7 +4601,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST41 - 0x0028 + 0x002c 0x00 32 @@ -4548,7 +4616,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST40 - 0x002c + 0x0030 0x00 32 @@ -4563,7 +4631,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST51 - 0x0030 + 0x0034 0x00 32 @@ -4578,7 +4646,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST50 - 0x0034 + 0x0038 0x00 32 @@ -4593,7 +4661,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST61 - 0x0038 + 0x003c 0x00 32 @@ -4608,7 +4676,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST60 - 0x003c + 0x0040 0x00 32 @@ -4623,7 +4691,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST71 - 0x0040 + 0x0044 0x00 32 @@ -4638,7 +4706,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST70 - 0x0044 + 0x0048 0x00 32 @@ -4654,7 +4722,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> MSG_LENGTH1 - 0x0048 + 0x004c 0x00 32 @@ -4669,7 +4737,7 @@ in bits]]> MSG_LENGTH0 - 0x004c + 0x0050 0x00 32 @@ -4684,7 +4752,7 @@ in bits]]> EV_STATUS - 0x0050 + 0x0054 0x00 32 @@ -4714,7 +4782,7 @@ in bits]]> EV_PENDING - 0x0054 + 0x0058 0x00 32 @@ -4744,7 +4812,7 @@ in bits]]> EV_ENABLE - 0x0058 + 0x005c 0x00 32 @@ -4774,7 +4842,7 @@ in bits]]> FIFO - 0x005c + 0x0060 0x00 32 @@ -4832,7 +4900,7 @@ in bits]]> 0 - 0x60 + 0x64 registers @@ -4908,10 +4976,26 @@ microcode instructions starting at mpstart]]> - STATUS + POWER 0x0010 0x00 32 + + + on + 0 + [0:0] + 0 + + + + + + STATUS + 0x0014 + 0x00 + 32 running @@ -4933,7 +5017,7 @@ microcode memory areas will stall until this bit is clear]]> EV_STATUS - 0x0014 + 0x0018 0x00 32 @@ -4956,7 +5040,7 @@ microcode memory areas will stall until this bit is clear]]> EV_PENDING - 0x0018 + 0x001c 0x00 32 @@ -4979,7 +5063,7 @@ microcode memory areas will stall until this bit is clear]]> EV_ENABLE - 0x001c + 0x0020 0x00 32 @@ -5003,7 +5087,7 @@ microcode memory areas will stall until this bit is clear]]> INSTRUCTION - 0x0020 + 0x0024 0x00 32 @@ -5061,7 +5145,7 @@ exactly reflects the binary layout of an Engine instruction.]]> 0 - 0x24 + 0x28 registers diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index 5ab257e10..429e50c6b 100644 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ diff --git a/services/engine-sha512/src/main.rs b/services/engine-sha512/src/main.rs index 238fd352f..738d55ab5 100644 --- a/services/engine-sha512/src/main.rs +++ b/services/engine-sha512/src/main.rs @@ -52,6 +52,7 @@ mod implementation { } pub(crate) fn setup(&mut self, config: Sha2Config) { + self.csr.wfo(utra::sha512::POWER_ON, 1); match config { Sha2Config::Sha512 => { self.csr.wo(utra::sha512::CONFIG, @@ -71,9 +72,11 @@ mod implementation { } self.csr.wfo(utra::sha512::COMMAND_HASH_START, 1); self.csr.wfo(utra::sha512::EV_ENABLE_SHA512_DONE, 1); + self.csr.wfo(utra::sha512::POWER_ON, 0); } pub(crate) fn update(&mut self, buf: &[u8]) { + self.csr.wfo(utra::sha512::POWER_ON, 1); let sha = self.fifo.as_mut_ptr() as *mut u32; let sha_byte = self.fifo.as_mut_ptr() as *mut u8; @@ -107,9 +110,11 @@ mod implementation { } } } + self.csr.wfo(utra::sha512::POWER_ON, 0); } pub(crate) fn finalize(&mut self) -> ([u8; 64], u64) { + self.csr.wfo(utra::sha512::POWER_ON, 1); self.csr.wfo(utra::sha512::COMMAND_HASH_PROCESS, 1); while self.csr.rf(utra::sha512::EV_PENDING_SHA512_DONE) == 0 { xous::yield_slice(); @@ -142,10 +147,12 @@ mod implementation { } self.csr.wo(utra::sha512::CONFIG, 0); // clear all config bits, including EN, which resets the unit + self.csr.wfo(utra::sha512::POWER_ON, 0); (hash, length_in_bits) } pub(crate) fn reset(&mut self) { + self.csr.wfo(utra::sha512::POWER_ON, 1); if self.csr.rf(utra::sha512::FIFO_RUNNING) != 0 { // if it's running, call digest, then reset let sha = self.fifo.as_mut_ptr() as *mut u32; @@ -160,12 +167,16 @@ mod implementation { } self.csr.wfo(utra::sha512::EV_PENDING_SHA512_DONE, 1); self.csr.wo(utra::sha512::CONFIG, 0); // clear all config bits, including EN, which resets the unit + self.csr.wfo(utra::sha512::POWER_ON, 0); } - pub(crate) fn is_idle(&self) -> bool { + pub(crate) fn is_idle(&mut self) -> bool { + self.csr.wfo(utra::sha512::POWER_ON, 1); if self.csr.rf(utra::sha512::CONFIG_SHA_EN) == 0 && self.csr.rf(utra::sha512::FIFO_RUNNING) == 0 { + self.csr.wfo(utra::sha512::POWER_ON, 0); true } else { + self.csr.wfo(utra::sha512::POWER_ON, 0); false } } diff --git a/services/llio/src/api.rs b/services/llio/src/api.rs index 27a05c86d..ee0bf142d 100644 --- a/services/llio/src/api.rs +++ b/services/llio/src/api.rs @@ -184,6 +184,8 @@ pub(crate) enum Opcode { PowerAudio, //(bool), PowerSelf, //(bool), // setting this to false allows the EC to turn off our power PowerBoostMode, //(bool), + PowerCrypto, + PowerCryptoStatus, EcSnoopAllow, //(bool), EcReset, EcPowerOn, diff --git a/services/llio/src/lib.rs b/services/llio/src/lib.rs index 06abc2904..3021f7ab8 100644 --- a/services/llio/src/lib.rs +++ b/services/llio/src/lib.rs @@ -437,6 +437,26 @@ impl Llio { Message::new_blocking_scalar(Opcode::PowerAudio.to_usize().unwrap(), arg, 0, 0, 0) ).map(|_| ()) } + // -149mA @ 4152mV crypto on // -143mA @ 4149mV crypto off + pub fn crypto_on(&self, ena: bool) -> Result<(), xous::Error> { + let arg = if ena { 1 } else { 0 }; + send_message(self.conn, + Message::new_blocking_scalar(Opcode::PowerCrypto.to_usize().unwrap(), arg, 0, 0, 0) + ).map(|_| ()) + } + pub fn crypto_power_status(&self) -> Result<(bool, bool, bool), xous::Error> { // sha, engine, override status + let response = send_message(self.conn, + Message::new_blocking_scalar(Opcode::PowerCryptoStatus.to_usize().unwrap(), 0, 0, 0, 0) + )?; + if let xous::Result::Scalar1(val) = response { + let sha = if (val & 1) == 0 { false } else { true }; + let engine = if (val & 2) == 0 { false } else { true }; + let force = if (val & 4) == 0 { false } else { true }; + Ok((sha, engine, force)) + } else { + Err(xous::Error::InternalError) + } + } pub fn soc_gitrev(&self) -> Result<(u8, u8, u8, u8, u32), xous::Error> { let response = send_message(self.conn, Message::new_blocking_scalar(Opcode::InfoGit.to_usize().unwrap(), 0, 0, 0, 0))?; diff --git a/services/llio/src/main.rs b/services/llio/src/main.rs index c67771ba7..47327fbde 100644 --- a/services/llio/src/main.rs +++ b/services/llio/src/main.rs @@ -202,6 +202,7 @@ mod implementation { xl.event_susres.push_fixed_value(RegOrField::Reg(utra::btevents::EV_PENDING), 0xFFFF_FFFF); xl.event_susres.push(RegOrField::Reg(utra::btevents::EV_ENABLE), None); + xl.power_csr.rmwf(utra::power::POWER_CRYPTO_ON, 0); // save power on crypto block xl.power_susres.push(RegOrField::Reg(utra::power::POWER), None); xl.power_susres.push(RegOrField::Reg(utra::power::VIBE), None); xl.power_susres.push_fixed_value(RegOrField::Reg(utra::power::EV_PENDING), 0xFFFF_FFFF); @@ -282,6 +283,20 @@ mod implementation { self.power_csr.rmwf(utra::power::POWER_AUDIO, 0); } } + pub fn power_crypto(&mut self, power_on: bool) { + if power_on { + self.power_csr.rmwf(utra::power::POWER_CRYPTO_ON, 1); + } else { + self.power_csr.rmwf(utra::power::POWER_CRYPTO_ON, 0); + } + } + pub fn power_crypto_status(&self) -> (bool, bool, bool, bool) { + let sha = if self.power_csr.rf(utra::power::CLK_STATUS_SHA_ON) == 0 {false} else {true}; + let engine = if self.power_csr.rf(utra::power::CLK_STATUS_ENGINE_ON) == 0 {false} else {true}; + let force = if self.power_csr.rf(utra::power::CLK_STATUS_BTPOWER_ON) == 0 {false} else {true}; + let overall = if self.power_csr.rf(utra::power::CLK_STATUS_CRYPTO_ON) == 0 {false} else {true}; + (overall, sha, engine, force) + } pub fn power_self(&mut self, power_on: bool) { if power_on { info!("setting self-power state to on"); @@ -421,6 +436,10 @@ mod implementation { pub fn get_info_platform(&self, ) -> (usize, usize) { (0, 0) } pub fn get_info_target(&self, ) -> (usize, usize) { (0, 0) } pub fn power_audio(&self, _power_on: bool) {} + pub fn power_crypto(&self, _power_on: bool) {} + pub fn power_crypto_status(&self) -> (bool, bool, bool, bool) { + (true, true, true, true) + } pub fn power_self(&self, _power_on: bool) {} pub fn power_boost_mode(&self, _power_on: bool) {} pub fn ec_snoop_allow(&self, _power_on: bool) {} @@ -624,6 +643,22 @@ fn xmain() -> ! { } xous::return_scalar(msg.sender, 0).expect("couldn't confirm audio power was set"); }), + Some(Opcode::PowerCrypto) => msg_blocking_scalar_unpack!(msg, power_on, _, _, _, { + if power_on == 0 { + llio.power_crypto(false); + } else { + llio.power_crypto(true); + } + xous::return_scalar(msg.sender, 0).expect("couldn't confirm crypto power was set"); + }), + Some(Opcode::PowerCryptoStatus) => msg_blocking_scalar_unpack!(msg, _, _, _, _, { + let (_, sha, engine, force) = llio.power_crypto_status(); + let mut ret = 0; + if sha { ret |= 1 }; + if engine { ret |= 2 }; + if force { ret |= 4 }; + xous::return_scalar(msg.sender, ret).expect("couldn't return crypto unit power status"); + }), Some(Opcode::PowerSelf) => msg_scalar_unpack!(msg, power_on, _, _, _, { if power_on == 0 { llio.power_self(false); diff --git a/services/shellchat/src/cmds/sleep.rs b/services/shellchat/src/cmds/sleep.rs index d2ea71d85..65339ca71 100644 --- a/services/shellchat/src/cmds/sleep.rs +++ b/services/shellchat/src/cmds/sleep.rs @@ -68,7 +68,7 @@ impl<'a> ShellCmdApi<'a> for Sleep { use core::fmt::Write; let mut ret = String::<1024>::new(); - let helpstring = "sleep [now] [current] [ship] [kill] [coldboot] [killbounce] [sus] [stress]"; + let helpstring = "sleep [now] [current] [ship] [kill] [coldboot] [killbounce] [sus] [stress] [crypton] [cryptoff]"; let mut tokens = args.as_str().unwrap().split(' '); @@ -78,6 +78,14 @@ impl<'a> ShellCmdApi<'a> for Sleep { if let Some(sub_cmd) = tokens.next() { match sub_cmd { + "crypton" => { + env.llio.crypto_on(true).unwrap(); + write!(ret, "crypto power is now on").unwrap(); + } + "cryptoff" => { + env.llio.crypto_on(false).unwrap(); + write!(ret, "crypto power is now off").unwrap(); + } "sus" => { self.susres.initiate_suspend().unwrap(); // the message below is sent after we wake up diff --git a/svd2utra/examples/soc.svd b/svd2utra/examples/soc.svd index 89e26710d..294e8b04d 100644 --- a/svd2utra/examples/soc.svd +++ b/svd2utra/examples/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x974ecf35 + 0x15a07b18 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x13 + 0x15 32 @@ -2392,7 +2392,7 @@ register to disable individual events.]]> POWER 0x0000 - 0x0a + 0x20a 32 @@ -2456,12 +2456,64 @@ the host role.]]> + + crypto_on + 9 + [9:9] + 9 + + + + ignore_locked + 10 + [10:10] + 10 + + + + + + CLK_STATUS + 0x0004 + 0x00 + 32 + + + crypto_on + 0 + [0:0] + 0 + + + + sha_on + 1 + [1:1] + 1 + + + + engine_on + 2 + [2:2] + 2 + + + + btpower_on + 3 + [3:3] + 3 + + VIBE - 0x0004 + 0x0008 0x00 32 @@ -2477,7 +2529,7 @@ reset fashion]]> EV_STATUS - 0x0008 + 0x000c 0x00 32 @@ -2493,7 +2545,7 @@ reset fashion]]> EV_PENDING - 0x000c + 0x0010 0x00 32 @@ -2509,7 +2561,7 @@ reset fashion]]> EV_ENABLE - 0x0010 + 0x0014 0x00 32 @@ -2525,7 +2577,7 @@ reset fashion]]> 0 - 0x14 + 0x18 registers @@ -3117,7 +3169,7 @@ inject too fast.]]> SEED1 0x0000 - 0x229e8191 + 0x3b676dbb 32 @@ -3132,7 +3184,7 @@ inject too fast.]]> SEED0 0x0004 - 0x261d606f + 0x2a12256d 32 @@ -4350,10 +4402,26 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> 0xF001D000 SHA512 + + POWER + 0x0000 + 0x00 + 32 + + + on + 0 + [0:0] + 0 + + + + CONFIG - 0x0000 + 0x0004 0x00 32 @@ -4390,7 +4458,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> COMMAND - 0x0004 + 0x0008 0x00 32 @@ -4413,7 +4481,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST01 - 0x0008 + 0x000c 0x00 32 @@ -4428,7 +4496,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST00 - 0x000c + 0x0010 0x00 32 @@ -4443,7 +4511,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST11 - 0x0010 + 0x0014 0x00 32 @@ -4458,7 +4526,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST10 - 0x0014 + 0x0018 0x00 32 @@ -4473,7 +4541,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST21 - 0x0018 + 0x001c 0x00 32 @@ -4488,7 +4556,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST20 - 0x001c + 0x0020 0x00 32 @@ -4503,7 +4571,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST31 - 0x0020 + 0x0024 0x00 32 @@ -4518,7 +4586,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST30 - 0x0024 + 0x0028 0x00 32 @@ -4533,7 +4601,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST41 - 0x0028 + 0x002c 0x00 32 @@ -4548,7 +4616,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST40 - 0x002c + 0x0030 0x00 32 @@ -4563,7 +4631,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST51 - 0x0030 + 0x0034 0x00 32 @@ -4578,7 +4646,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST50 - 0x0034 + 0x0038 0x00 32 @@ -4593,7 +4661,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST61 - 0x0038 + 0x003c 0x00 32 @@ -4608,7 +4676,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST60 - 0x003c + 0x0040 0x00 32 @@ -4623,7 +4691,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST71 - 0x0040 + 0x0044 0x00 32 @@ -4638,7 +4706,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> DIGEST70 - 0x0044 + 0x0048 0x00 32 @@ -4654,7 +4722,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> MSG_LENGTH1 - 0x0048 + 0x004c 0x00 32 @@ -4669,7 +4737,7 @@ in bits]]> MSG_LENGTH0 - 0x004c + 0x0050 0x00 32 @@ -4684,7 +4752,7 @@ in bits]]> EV_STATUS - 0x0050 + 0x0054 0x00 32 @@ -4714,7 +4782,7 @@ in bits]]> EV_PENDING - 0x0054 + 0x0058 0x00 32 @@ -4744,7 +4812,7 @@ in bits]]> EV_ENABLE - 0x0058 + 0x005c 0x00 32 @@ -4774,7 +4842,7 @@ in bits]]> FIFO - 0x005c + 0x0060 0x00 32 @@ -4832,7 +4900,7 @@ in bits]]> 0 - 0x60 + 0x64 registers @@ -4908,10 +4976,26 @@ microcode instructions starting at mpstart]]> - STATUS + POWER 0x0010 0x00 32 + + + on + 0 + [0:0] + 0 + + + + + + STATUS + 0x0014 + 0x00 + 32 running @@ -4933,7 +5017,7 @@ microcode memory areas will stall until this bit is clear]]> EV_STATUS - 0x0014 + 0x0018 0x00 32 @@ -4956,7 +5040,7 @@ microcode memory areas will stall until this bit is clear]]> EV_PENDING - 0x0018 + 0x001c 0x00 32 @@ -4979,7 +5063,7 @@ microcode memory areas will stall until this bit is clear]]> EV_ENABLE - 0x001c + 0x0020 0x00 32 @@ -5003,7 +5087,7 @@ microcode memory areas will stall until this bit is clear]]> INSTRUCTION - 0x0020 + 0x0024 0x00 32 @@ -5061,7 +5145,7 @@ exactly reflects the binary layout of an Engine instruction.]]> 0 - 0x24 + 0x28 registers