From a5895f091a7d183b88955e63cb35bb55b3758c35 Mon Sep 17 00:00:00 2001 From: GitHub CI Date: Tue, 4 Jun 2024 10:18:29 +0000 Subject: [PATCH] CI: Update Caliptra RTL --- hw/latest/registers/src/csrng.rs | 2 +- hw/latest/registers/src/doe.rs | 2 +- hw/latest/registers/src/dv.rs | 2 +- hw/latest/registers/src/ecc.rs | 2 +- hw/latest/registers/src/el2_pic_ctrl.rs | 2 +- hw/latest/registers/src/entropy_src.rs | 2 +- hw/latest/registers/src/hmac.rs | 2 +- hw/latest/registers/src/kv.rs | 2 +- hw/latest/registers/src/lib.rs | 2 +- hw/latest/registers/src/mbox.rs | 2 +- hw/latest/registers/src/pv.rs | 2 +- hw/latest/registers/src/sha256.rs | 2 +- hw/latest/registers/src/sha512.rs | 2 +- hw/latest/registers/src/sha512_acc.rs | 2 +- hw/latest/registers/src/soc_ifc.rs | 20 ++++++++++++++++++-- hw/latest/registers/src/soc_ifc_trng.rs | 2 +- hw/latest/registers/src/spi_host.rs | 2 +- hw/latest/registers/src/uart.rs | 2 +- hw/latest/rtl | 2 +- 19 files changed, 36 insertions(+), 20 deletions(-) diff --git a/hw/latest/registers/src/csrng.rs b/hw/latest/registers/src/csrng.rs index 7ea370f44e..c2e48c5f25 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..3193a1eb6d 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..a2641e4095 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..30ad175dd5 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..95e401541f 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..3dd5722341 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..34f7b6e8dc 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..75d99b9993 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..61cb68785e 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![no_std] #![allow(clippy::erasing_op)] diff --git a/hw/latest/registers/src/mbox.rs b/hw/latest/registers/src/mbox.rs index ef3f048d21..ec1ecaab85 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..90b636003d 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..0d3ea0225e 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..c6dbb95920 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..aeba6d43ab 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..6ad1edbb58 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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)] @@ -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)] @@ -2347,7 +2360,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 diff --git a/hw/latest/registers/src/soc_ifc_trng.rs b/hw/latest/registers/src/soc_ifc_trng.rs index ad93cf616b..d4d4cfee68 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..b26d877b31 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![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..404f28f9f5 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 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32 // #![allow(clippy::erasing_op)] #![allow(clippy::identity_op)] diff --git a/hw/latest/rtl b/hw/latest/rtl index e928359b07..46fdcd8e6a 160000 --- a/hw/latest/rtl +++ b/hw/latest/rtl @@ -1 +1 @@ -Subproject commit e928359b071f3c354a194a31c2b3bdac8adb20d0 +Subproject commit 46fdcd8e6a6c34f0479ff9e51ccedbb2adbe7e32