From a1726fa7ffecdcc8f8f4d09bd0bdc97ef3b72f11 Mon Sep 17 00:00:00 2001 From: Manish V Badarkhe Date: Wed, 7 Feb 2024 14:51:35 +0000 Subject: [PATCH] feat(fvp): remove left-over RSS usage Remove any residual RSS usage in the FVP platform, complementing the changes made in commit dea307fd6cca2dad56867e757804224a8654bc38. Signed-off-by: Manish V Badarkhe Change-Id: I9ced272503456361610ec0c7783d270349233926 --- plat/arm/board/fvp/fvp_bl1_measured_boot.c | 33 ----------------- plat/arm/board/fvp/fvp_bl2_measured_boot.c | 41 ---------------------- plat/arm/board/fvp/platform.mk | 16 --------- 3 files changed, 90 deletions(-) diff --git a/plat/arm/board/fvp/fvp_bl1_measured_boot.c b/plat/arm/board/fvp/fvp_bl1_measured_boot.c index dc95ba1c0..477ae2776 100644 --- a/plat/arm/board/fvp/fvp_bl1_measured_boot.c +++ b/plat/arm/board/fvp/fvp_bl1_measured_boot.c @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -23,42 +22,10 @@ const event_log_metadata_t fvp_event_log_metadata[] = { { EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */ }; -/* FVP table with platform specific image IDs and metadata. Intentionally not a - * const struct, some members might set by bootloaders during trusted boot. - */ -struct rss_mboot_metadata fvp_rss_mboot_metadata[] = { - { - .id = FW_CONFIG_ID, - .slot = U(6), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_FW_CONFIG_STRING, - .pk_oid = ZERO_OID, - .lock_measurement = true }, - { - .id = TB_FW_CONFIG_ID, - .slot = U(7), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_TB_FW_CONFIG_STRING, - .pk_oid = ZERO_OID, - .lock_measurement = true }, - { - .id = BL2_IMAGE_ID, - .slot = U(8), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_BL2_STRING, - .pk_oid = ZERO_OID, - .lock_measurement = true }, - - { - .id = RSS_MBOOT_INVALID_ID } -}; - void bl1_plat_mboot_init(void) { event_log_init(event_log, event_log + sizeof(event_log)); event_log_write_header(); - - rss_measured_boot_init(fvp_rss_mboot_metadata); } void bl1_plat_mboot_finish(void) diff --git a/plat/arm/board/fvp/fvp_bl2_measured_boot.c b/plat/arm/board/fvp/fvp_bl2_measured_boot.c index 349e064d8..369bcb493 100644 --- a/plat/arm/board/fvp/fvp_bl2_measured_boot.c +++ b/plat/arm/board/fvp/fvp_bl2_measured_boot.c @@ -8,7 +8,6 @@ #include #include -#include #if defined(ARM_COT_cca) #include #else @@ -57,44 +56,6 @@ const event_log_metadata_t fvp_event_log_metadata[] = { { EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */ }; -/* FVP table with platform specific image IDs and metadata. Intentionally not a - * const struct, some members might set by bootloaders during trusted boot. - */ -struct rss_mboot_metadata fvp_rss_mboot_metadata[] = { - { - .id = BL31_IMAGE_ID, - .slot = U(9), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_BL31_STRING, - .pk_oid = BL31_IMAGE_KEY_OID, - .lock_measurement = true }, - { - .id = HW_CONFIG_ID, - .slot = U(10), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_HW_CONFIG_STRING, - .pk_oid = HW_CONFIG_KEY_OID, - .lock_measurement = true }, - { - .id = SOC_FW_CONFIG_ID, - .slot = U(11), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_SOC_FW_CONFIG_STRING, - .pk_oid = SOC_FW_CONFIG_KEY_OID, - .lock_measurement = true }, -#if ENABLE_RME - { - .id = RMM_IMAGE_ID, - .slot = U(12), - .signer_id_size = SIGNER_ID_MIN_SIZE, - .sw_type = RSS_MBOOT_RMM_STRING, - .pk_oid = RMM_IMAGE_KEY_OID, - .lock_measurement = true }, -#endif /* ENABLE_RME */ - { - .id = RSS_MBOOT_INVALID_ID } -}; - void bl2_plat_mboot_init(void) { uint8_t *event_log_start; @@ -126,8 +87,6 @@ void bl2_plat_mboot_init(void) event_log_max_size); event_log_init((uint8_t *)event_log_start, event_log_finish); - - rss_measured_boot_init(fvp_rss_mboot_metadata); } int plat_mboot_measure_critical_data(unsigned int critical_data_id, diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 7501bc445..35086e4f9 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -443,22 +443,6 @@ ifneq (${RESET_TO_BL2}, 0) override BL1_SOURCES = endif -# Include Measured Boot makefile before any Crypto library makefile. -# Crypto library makefile may need default definitions of Measured Boot build -# flags present in Measured Boot makefile. -ifeq (${MEASURED_BOOT},1) - RSS_MEASURED_BOOT_MK := drivers/measured_boot/rss/rss_measured_boot.mk - $(info Including ${RSS_MEASURED_BOOT_MK}) - include ${RSS_MEASURED_BOOT_MK} - - ifneq (${MBOOT_RSS_HASH_ALG}, sha256) - $(eval $(call add_define,TF_MBEDTLS_MBOOT_USE_SHA512)) - endif - - BL1_SOURCES += ${MEASURED_BOOT_SOURCES} - BL2_SOURCES += ${MEASURED_BOOT_SOURCES} -endif - include plat/arm/board/common/board_common.mk include plat/arm/common/arm_common.mk