Skip to content

Remove FPGA-related dead code that was moved to caliptra-sw #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swenson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove FPGA-related dead code that was moved to caliptra-sw #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,29 +222,29 @@ libtock_small_panic = { path = "runtime/userspace/libtock/panic_handlers/small_p
libtock_unittest = { path = "runtime/userspace/libtock/unittest" }

# caliptra dependencies; keep git revs in sync
caliptra-api = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-api-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-auth-man-gen = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-auth-man-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-builder = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-emu-bus = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-emu-cpu = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-emu-derive = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-emu-periph = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-emu-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-error = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1", default-features = false }
caliptra-hw-model = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-hw-model-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-image-crypto = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1", default-features = false, features = ["rustcrypto"] }
caliptra-image-fake-keys = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-image-gen = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-image-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-registers = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-test = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-test-harness = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
caliptra-test-harness-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
ureg = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1" }
dpe = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "386d3dc97853311ebd3d5a5b3944e9a1d5bfb9c1", default-features = false, features = ["dpe_profile_p384_sha384"] }
caliptra-api = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-api-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-auth-man-gen = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-auth-man-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-builder = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-emu-bus = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-emu-cpu = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-emu-derive = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-emu-periph = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-emu-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-error = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4", default-features = false }
caliptra-hw-model = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-hw-model-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-image-crypto = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4", default-features = false, features = ["rustcrypto"] }
caliptra-image-fake-keys = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-image-gen = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-image-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-registers = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-test = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-test-harness = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
caliptra-test-harness-types = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
ureg = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4" }
dpe = { git = "https://github.com/chipsalliance/caliptra-sw", rev = "9ed3cdd2f97121d32d213df17d21ba623927b7e4", default-features = false, features = ["dpe_profile_p384_sha384"] }

# local caliptra dependency; useful when developing
# caliptra-api = { path = "../caliptra-sw/api" }
Expand Down
99 changes: 0 additions & 99 deletions hw/model/src/fpga_regs.rs
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions hw/model/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@ use caliptra_api::{self as api, SocManager};
use caliptra_api_types as api_types;
use caliptra_emu_bus::Event;
pub use caliptra_emu_cpu::{CodeRange, ImageInfo, StackInfo, StackRange};
use caliptra_hw_model::otp_provision::{
LifecycleControllerState, LifecycleRawTokens, LifecycleToken,
};
use caliptra_hw_model::{BootParams, ExitStatus, Output};
use caliptra_hw_model_types::{
EtrngResponse, HexBytes, HexSlice, RandomEtrngResponses, RandomNibbles, DEFAULT_CPTRA_OBF_KEY,
};
use caliptra_image_types::FwVerificationPqcKeyType;
use caliptra_registers::mcu_mbox0::enums::MboxStatusE;
pub use mcu_mgr::McuManager;
use mcu_rom_common::{
LifecycleControllerState, LifecycleRawTokens, LifecycleToken, McuBootMilestones,
};
use mcu_rom_common::McuBootMilestones;
pub use model_emulated::ModelEmulated;
use rand::{rngs::StdRng, SeedableRng};
use sha2::Digest;
Expand All @@ -27,14 +28,12 @@ use std::sync::mpsc;
pub use vmem::read_otp_vmem_data;

mod bus_logger;
mod fpga_regs;
#[cfg(feature = "fpga_realtime")]
pub mod lcc;
mod mcu_mgr;
mod model_emulated;
#[cfg(feature = "fpga_realtime")]
mod model_fpga_realtime;
mod otp_provision;
mod vmem;

pub enum ShaAccMode {
Expand Down
6 changes: 3 additions & 3 deletions hw/model/src/model_emulated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

use crate::bus_logger::BusLogger;
use crate::bus_logger::LogFile;
use crate::otp_provision::lc_generate_memory;
use crate::otp_provision::otp_generate_lifecycle_tokens_mem;
use crate::trace_path_or_env;
use crate::InitParams;
use crate::McuHwModel;
Expand All @@ -24,6 +22,9 @@ use caliptra_emu_periph::{
use caliptra_emu_types::RvAddr;
use caliptra_emu_types::RvData;
use caliptra_emu_types::RvSize;
use caliptra_hw_model::otp_provision::{
lc_generate_memory, otp_generate_lifecycle_tokens_mem, LifecycleControllerState,
};
use caliptra_hw_model::DeviceLifecycle;
use caliptra_hw_model::ExitStatus;
use caliptra_hw_model::ModelError;
Expand All @@ -42,7 +43,6 @@ use emulator_periph::{I3c, I3cController, Mci, McuRootBus, McuRootBusArgs, Otp,
use emulator_registers_generated::axicdma::AxicdmaPeripheral;
use emulator_registers_generated::root_bus::AutoRootBus;
use mcu_config::McuMemoryMap;
use mcu_rom_common::LifecycleControllerState;
use mcu_rom_common::McuBootMilestones;
use mcu_testing_common::i3c_socket_server::start_i3c_socket;
use mcu_testing_common::{MCU_RUNNING, MCU_RUNTIME_STARTED};
Expand Down
3 changes: 2 additions & 1 deletion hw/model/src/model_fpga_realtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ use caliptra_emu_bus::{Bus, BusError, BusMmio, Event};
use caliptra_emu_periph::MailboxRequester;
use caliptra_emu_types::{RvAddr, RvData, RvSize};
use caliptra_hw_model::openocd::openocd_jtag_tap::{JtagParams, JtagTap, OpenOcdJtagTap};
use caliptra_hw_model::otp_provision::LifecycleControllerState;
use caliptra_hw_model::{
DeviceLifecycle, HwModel, InitParams as CaliptraInitParams, ModelFpgaSubsystem, Output,
SecurityState, XI3CWrapper,
};
use caliptra_registers::i3ccsr::regs::StbyCrDeviceAddrWriteVal;
use mcu_rom_common::{LifecycleControllerState, McuBootMilestones};
use mcu_rom_common::McuBootMilestones;
use mcu_testing_common::i3c::{
I3cBusCommand, I3cBusResponse, I3cTcriCommand, I3cTcriResponseXfer, ResponseDescriptor,
};
Expand Down
Loading
Loading