From 1cf3e2f0a8eb0d6324ce3db68dd5c78bdb690a8a Mon Sep 17 00:00:00 2001 From: Manish V Badarkhe Date: Mon, 20 Mar 2023 14:58:06 +0000 Subject: feat(fvp): add Event Log maximum size property in DT Updated the code to get and set the 'tpm_event_log_max_size' property in the event_log.dtsi. In this change, the maximum Event Log buffer size allocated by BL1 is passed to BL2, rather than both relying on the maximum Event Log buffer size macro. Change-Id: I7aa6256390872171e362b6f166f3f7335aa6e425 Signed-off-by: Manish V Badarkhe --- plat/arm/board/fvp/fdts/event_log.dtsi | 1 + plat/arm/board/fvp/fvp_bl1_measured_boot.c | 3 ++- plat/arm/board/fvp/fvp_bl2_measured_boot.c | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'plat/arm/board') diff --git a/plat/arm/board/fvp/fdts/event_log.dtsi b/plat/arm/board/fvp/fdts/event_log.dtsi index 47af672df..8e2654209 100644 --- a/plat/arm/board/fvp/fdts/event_log.dtsi +++ b/plat/arm/board/fvp/fdts/event_log.dtsi @@ -9,4 +9,5 @@ event_log: tpm_event_log { compatible = "arm,tpm_event_log"; tpm_event_log_addr = <0x0 0x0>; tpm_event_log_size = <0x0>; + tpm_event_log_max_size = <0x0>; }; diff --git a/plat/arm/board/fvp/fvp_bl1_measured_boot.c b/plat/arm/board/fvp/fvp_bl1_measured_boot.c index 76cd91824..72fdfef89 100644 --- a/plat/arm/board/fvp/fvp_bl1_measured_boot.c +++ b/plat/arm/board/fvp/fvp_bl1_measured_boot.c @@ -63,7 +63,8 @@ void bl1_plat_mboot_finish(void) event_log_cur_size = event_log_get_cur_size(event_log); int rc = arm_set_tb_fw_info((uintptr_t)event_log, - event_log_cur_size); + event_log_cur_size, + PLAT_ARM_EVENT_LOG_MAX_SIZE); if (rc != 0) { /* * It is a fatal error because on FVP platform, BL2 software diff --git a/plat/arm/board/fvp/fvp_bl2_measured_boot.c b/plat/arm/board/fvp/fvp_bl2_measured_boot.c index 7b0673a14..e6b919282 100644 --- a/plat/arm/board/fvp/fvp_bl2_measured_boot.c +++ b/plat/arm/board/fvp/fvp_bl2_measured_boot.c @@ -90,9 +90,11 @@ void bl2_plat_mboot_init(void) uint8_t *event_log_start; uint8_t *event_log_finish; size_t bl1_event_log_size; + size_t event_log_max_size; int rc; - rc = arm_get_tb_fw_info(&event_log_base, &bl1_event_log_size); + rc = arm_get_tb_fw_info(&event_log_base, &bl1_event_log_size, + &event_log_max_size); if (rc != 0) { ERROR("%s(): Unable to get Event Log info from TB_FW_CONFIG\n", __func__); @@ -111,7 +113,7 @@ void bl2_plat_mboot_init(void) event_log_start = (uint8_t *)((uintptr_t)event_log_base + bl1_event_log_size); event_log_finish = (uint8_t *)((uintptr_t)event_log_base + - PLAT_ARM_EVENT_LOG_MAX_SIZE); + event_log_max_size); event_log_init((uint8_t *)event_log_start, event_log_finish); -- cgit v1.2.3