diff --git a/hw/latest/registers/src/csrng.rs b/hw/latest/registers/src/csrng.rs index 7ea370f44e..c3112a80e3 100644 --- a/hw/latest/registers/src/csrng.rs +++ b/hw/latest/registers/src/csrng.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/doe.rs b/hw/latest/registers/src/doe.rs index 04f134cba6..6f13a324b7 100644 --- a/hw/latest/registers/src/doe.rs +++ b/hw/latest/registers/src/doe.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/dv.rs b/hw/latest/registers/src/dv.rs index ed71c9263c..73ca684bc0 100644 --- a/hw/latest/registers/src/dv.rs +++ b/hw/latest/registers/src/dv.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/ecc.rs b/hw/latest/registers/src/ecc.rs index 0a796b0bf3..6748160230 100644 --- a/hw/latest/registers/src/ecc.rs +++ b/hw/latest/registers/src/ecc.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/el2_pic_ctrl.rs b/hw/latest/registers/src/el2_pic_ctrl.rs index 85532ef83b..a26fcc74ef 100644 --- a/hw/latest/registers/src/el2_pic_ctrl.rs +++ b/hw/latest/registers/src/el2_pic_ctrl.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/entropy_src.rs b/hw/latest/registers/src/entropy_src.rs index db5a5a4cab..cf009b49d9 100644 --- a/hw/latest/registers/src/entropy_src.rs +++ b/hw/latest/registers/src/entropy_src.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/hmac.rs b/hw/latest/registers/src/hmac.rs index 1c779fab63..a357ffba0b 100644 --- a/hw/latest/registers/src/hmac.rs +++ b/hw/latest/registers/src/hmac.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/kv.rs b/hw/latest/registers/src/kv.rs index 01023539f1..1f33335340 100644 --- a/hw/latest/registers/src/kv.rs +++ b/hw/latest/registers/src/kv.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/lib.rs b/hw/latest/registers/src/lib.rs index ad85e80b2f..9c581fa12c 100644 --- a/hw/latest/registers/src/lib.rs +++ b/hw/latest/registers/src/lib.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![no_std] #![allow(clippy::erasing_op)] @@ -141,7 +141,7 @@ pub mod regs { pub fn hmac_block_dest_valid(&self) -> bool { ((self.0 >> 7) & 1) != 0 } - /// SHA BLOCK is a valid destination + /// Reserved field. No SHA key vault interface #[inline(always)] pub fn sha_block_dest_valid(&self) -> bool { ((self.0 >> 8) & 1) != 0 @@ -203,7 +203,7 @@ pub mod regs { pub fn hmac_block_dest_valid(self, val: bool) -> Self { Self((self.0 & !(1 << 7)) | (u32::from(val) << 7)) } - /// SHA BLOCK is a valid destination + /// Reserved field. No SHA key vault interface #[inline(always)] pub fn sha_block_dest_valid(self, val: bool) -> Self { Self((self.0 & !(1 << 8)) | (u32::from(val) << 8)) diff --git a/hw/latest/registers/src/mbox.rs b/hw/latest/registers/src/mbox.rs index ef3f048d21..846bf2d525 100644 --- a/hw/latest/registers/src/mbox.rs +++ b/hw/latest/registers/src/mbox.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/pv.rs b/hw/latest/registers/src/pv.rs index 92ad9e614b..5bf7c39076 100644 --- a/hw/latest/registers/src/pv.rs +++ b/hw/latest/registers/src/pv.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/sha256.rs b/hw/latest/registers/src/sha256.rs index ef41f84c38..5cc48414eb 100644 --- a/hw/latest/registers/src/sha256.rs +++ b/hw/latest/registers/src/sha256.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/sha512.rs b/hw/latest/registers/src/sha512.rs index b9a155952e..63a806e6d7 100644 --- a/hw/latest/registers/src/sha512.rs +++ b/hw/latest/registers/src/sha512.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/sha512_acc.rs b/hw/latest/registers/src/sha512_acc.rs index 82fc52b03f..38ded3beaa 100644 --- a/hw/latest/registers/src/sha512_acc.rs +++ b/hw/latest/registers/src/sha512_acc.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/soc_ifc.rs b/hw/latest/registers/src/soc_ifc.rs index dce856ba21..d0b4178a06 100644 --- a/hw/latest/registers/src/soc_ifc.rs +++ b/hw/latest/registers/src/soc_ifc.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] @@ -689,6 +689,8 @@ impl RegisterBlock { } } /// SOC provided count in cycles for WDT1 timeout. + /// [br]Caliptra Access: RW + /// [br]SOC Access: RW /// /// Read value: [`u32`]; Write value: [`u32`] #[inline(always)] @@ -703,6 +705,8 @@ impl RegisterBlock { } } /// Adaptive threshold values for entropy source health tests. + /// [br]Caliptra Access: RW + /// [br]SOC Access: RW /// /// Read value: [`soc_ifc::regs::CptraItrngEntropyConfig0ReadVal`]; Write value: [`soc_ifc::regs::CptraItrngEntropyConfig0WriteVal`] #[inline(always)] @@ -717,6 +721,8 @@ impl RegisterBlock { } } /// Repetition count value for entropy source health tests. + /// [br]Caliptra Access: RW + /// [br]SOC Access: RW /// /// Read value: [`soc_ifc::regs::CptraItrngEntropyConfig1ReadVal`]; Write value: [`soc_ifc::regs::CptraItrngEntropyConfig1WriteVal`] #[inline(always)] @@ -731,6 +737,8 @@ impl RegisterBlock { } } /// Set of reserved registers for survivability + /// [br]Caliptra Access: RW + /// [br]SOC Access: RW /// /// Read value: [`u32`]; Write value: [`u32`] #[inline(always)] @@ -1016,7 +1024,7 @@ impl RegisterBlock { ) } } - /// Control register to set the number of cycles for which FW update reset must be asserted. Default is 5. Max value is 255 (8 bit). + /// Control register to set the number of cycles for which FW update reset must be asserted. Minimum value is 5. Max value is 255 (8 bit). /// [br]Caliptra Access: RW /// [br]SOC Access: RO /// @@ -2197,6 +2205,11 @@ pub mod regs { pub fn uart_en(&self) -> bool { ((self.0 >> 3) & 1) != 0 } + /// + #[inline(always)] + pub fn lms_acc_en(&self) -> bool { + ((self.0 >> 4) & 1) != 0 + } } impl From for CptraHwConfigReadVal { #[inline(always)] @@ -2228,6 +2241,11 @@ pub mod regs { pub fn nmi_pin(&self) -> bool { ((self.0 >> 2) & 1) != 0 } + /// + #[inline(always)] + pub fn crypto_err(&self) -> bool { + ((self.0 >> 3) & 1) != 0 + } /// Construct a WriteVal that can be used to modify the contents of this register value. #[inline(always)] pub fn modify(self) -> CptraHwErrorFatalWriteVal { @@ -2264,6 +2282,11 @@ pub mod regs { pub fn nmi_pin(self, val: bool) -> Self { Self((self.0 & !(1 << 2)) | (u32::from(val) << 2)) } + /// + #[inline(always)] + pub fn crypto_err(self, val: bool) -> Self { + Self((self.0 & !(1 << 3)) | (u32::from(val) << 3)) + } } impl From for CptraHwErrorFatalWriteVal { #[inline(always)] @@ -2347,7 +2370,10 @@ pub mod regs { #[derive(Clone, Copy)] pub struct CptraHwRevIdReadVal(u32); impl CptraHwRevIdReadVal { - /// + /// Caliptra official release version. Bit field encoding is: + /// [br][lb]15:8[rb] Patch version + /// [br][lb] 7:4[rb] Minor version + /// [br][lb] 3:0[rb] Major version #[inline(always)] pub fn cptra_generation(&self) -> u32 { (self.0 >> 0) & 0xffff @@ -3588,6 +3614,11 @@ pub mod regs { pub fn mask_nmi_pin(&self) -> bool { ((self.0 >> 2) & 1) != 0 } + /// + #[inline(always)] + pub fn mask_crypto_err(&self) -> bool { + ((self.0 >> 3) & 1) != 0 + } /// Construct a WriteVal that can be used to modify the contents of this register value. #[inline(always)] pub fn modify(self) -> InternalHwErrorFatalMaskWriteVal { diff --git a/hw/latest/registers/src/soc_ifc_trng.rs b/hw/latest/registers/src/soc_ifc_trng.rs index ad93cf616b..da221587e5 100644 --- a/hw/latest/registers/src/soc_ifc_trng.rs +++ b/hw/latest/registers/src/soc_ifc_trng.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/spi_host.rs b/hw/latest/registers/src/spi_host.rs index 2d9df73ca9..c665cb08e8 100644 --- a/hw/latest/registers/src/spi_host.rs +++ b/hw/latest/registers/src/spi_host.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/registers/src/uart.rs b/hw/latest/registers/src/uart.rs index c18ab2b0f0..fdbc85934a 100644 --- a/hw/latest/registers/src/uart.rs +++ b/hw/latest/registers/src/uart.rs @@ -1,6 +1,6 @@ // Licensed under the Apache-2.0 license. // -// generated by caliptra_registers_generator with caliptra-rtl repo at e928359b071f3c354a194a31c2b3bdac8adb20d0 +// generated by caliptra_registers_generator with caliptra-rtl repo at 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/rtl b/hw/latest/rtl index e928359b07..7c10e2cc05 160000 --- a/hw/latest/rtl +++ b/hw/latest/rtl @@ -1 +1 @@ -Subproject commit e928359b071f3c354a194a31c2b3bdac8adb20d0 +Subproject commit 7c10e2cc05d28e8394c37d7ca84bda3210c8d17e