From d99700b0d64864e57d566748d57f01d0e126f703 Mon Sep 17 00:00:00 2001 From: Max Timkovich Date: Thu, 9 Jan 2025 11:42:34 -0800 Subject: [PATCH 1/3] Add MLDSA addr to fht info test. --- fmc/tests/fmc_integration_tests/test_rtalias.rs | 7 +++++-- rom/dev/src/fht.rs | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fmc/tests/fmc_integration_tests/test_rtalias.rs b/fmc/tests/fmc_integration_tests/test_rtalias.rs index 4e0c30ca2a..f9d6384905 100644 --- a/fmc/tests/fmc_integration_tests/test_rtalias.rs +++ b/fmc/tests/fmc_integration_tests/test_rtalias.rs @@ -5,7 +5,9 @@ use caliptra_builder::{ }; use caliptra_common::{ memory_layout::{ - ECC_FMCALIAS_TBS_ORG, ECC_LDEVID_TBS_ORG, FUSE_LOG_ORG, MEASUREMENT_LOG_ORG, PCR_LOG_ORG, + ECC_FMCALIAS_TBS_ORG, ECC_LDEVID_TBS_ORG, FUSE_LOG_ORG, MEASUREMENT_LOG_ORG, + MLDSA_FMCALIAS_TBS_ORG, MLDSA_FMCALIAS_TBS_SIZE, MLDSA_LDEVID_TBS_ORG, + MLDSA_LDEVID_TBS_SIZE, PCR_LOG_ORG, }, RomBootStatus::*, }; @@ -95,7 +97,6 @@ fn test_fht_info() { let data = hw.mailbox_execute(TEST_CMD_READ_FHT, &[]).unwrap().unwrap(); let fht = FirmwareHandoffTable::read_from_prefix(data.as_bytes()).unwrap(); - // [TODO][CAP2] Add mldsa layout assert_eq!(fht.ecc_ldevid_tbs_size, 552); assert_eq!(fht.ecc_fmcalias_tbs_size, 753); assert_eq!(fht.ecc_ldevid_tbs_addr, ECC_LDEVID_TBS_ORG); @@ -103,6 +104,8 @@ fn test_fht_info() { assert_eq!(fht.pcr_log_addr, PCR_LOG_ORG); assert_eq!(fht.meas_log_addr, MEASUREMENT_LOG_ORG); assert_eq!(fht.fuse_log_addr, FUSE_LOG_ORG); + assert_eq!(fht.mldsa_ldevid_tbs_addr, MLDSA_LDEVID_TBS_ORG); + assert_eq!(fht.mldsa_fmcalias_tbs_addr, MLDSA_FMCALIAS_TBS_ORG); } #[test] diff --git a/rom/dev/src/fht.rs b/rom/dev/src/fht.rs index 4680adc9bb..73adb5b3aa 100644 --- a/rom/dev/src/fht.rs +++ b/rom/dev/src/fht.rs @@ -62,6 +62,8 @@ pub fn initialize_fht(env: &mut RomEnv) { manifest_load_addr: &pdata.manifest1 as *const _ as u32, ecc_ldevid_tbs_addr: &pdata.ecc_ldevid_tbs as *const _ as u32, ecc_fmcalias_tbs_addr: &pdata.ecc_fmcalias_tbs as *const _ as u32, + mldsa_ldevid_tbs_addr: &pdata.mldsa_ldevid_tbs as *const _ as u32, + mldsa_fmcalias_tbs_addr: &pdata.mldsa_fmcalias_tbs as *const _ as u32, pcr_log_addr: &pdata.pcr_log as *const _ as u32, meas_log_addr: &pdata.measurement_log as *const _ as u32, fuse_log_addr: &pdata.fuse_log as *const _ as u32, From 81c1d2b9a595b5e124e7a793b9f7013fbd304937 Mon Sep 17 00:00:00 2001 From: Max Timkovich Date: Thu, 9 Jan 2025 12:00:23 -0800 Subject: [PATCH 2/3] imports --- fmc/tests/fmc_integration_tests/test_rtalias.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fmc/tests/fmc_integration_tests/test_rtalias.rs b/fmc/tests/fmc_integration_tests/test_rtalias.rs index f9d6384905..c9f588e3ef 100644 --- a/fmc/tests/fmc_integration_tests/test_rtalias.rs +++ b/fmc/tests/fmc_integration_tests/test_rtalias.rs @@ -6,8 +6,7 @@ use caliptra_builder::{ use caliptra_common::{ memory_layout::{ ECC_FMCALIAS_TBS_ORG, ECC_LDEVID_TBS_ORG, FUSE_LOG_ORG, MEASUREMENT_LOG_ORG, - MLDSA_FMCALIAS_TBS_ORG, MLDSA_FMCALIAS_TBS_SIZE, MLDSA_LDEVID_TBS_ORG, - MLDSA_LDEVID_TBS_SIZE, PCR_LOG_ORG, + MLDSA_FMCALIAS_TBS_ORG, MLDSA_LDEVID_TBS_ORG, PCR_LOG_ORG, }, RomBootStatus::*, }; From e0e2daa97c1f2359bacb817b553f1dc2c58f7562 Mon Sep 17 00:00:00 2001 From: Max Timkovich Date: Thu, 9 Jan 2025 15:05:05 -0800 Subject: [PATCH 3/3] new fields --- fmc/tests/fmc_integration_tests/test_rtalias.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fmc/tests/fmc_integration_tests/test_rtalias.rs b/fmc/tests/fmc_integration_tests/test_rtalias.rs index c9f588e3ef..e05a69b22e 100644 --- a/fmc/tests/fmc_integration_tests/test_rtalias.rs +++ b/fmc/tests/fmc_integration_tests/test_rtalias.rs @@ -105,6 +105,8 @@ fn test_fht_info() { assert_eq!(fht.fuse_log_addr, FUSE_LOG_ORG); assert_eq!(fht.mldsa_ldevid_tbs_addr, MLDSA_LDEVID_TBS_ORG); assert_eq!(fht.mldsa_fmcalias_tbs_addr, MLDSA_FMCALIAS_TBS_ORG); + assert_ne!(fht.mldsa_ldevid_tbs_size, 0); + assert_ne!(fht.mldsa_fmcalias_tbs_size, 0); } #[test]