Merge "fix(drtm): adjust Event Log size in DLME" into integration

This commit is contained in:
Manish V Badarkhe 2024-12-31 16:00:36 +01:00 committed by TrustedFirmware Code Review
commit 9244331f35
2 changed files with 9 additions and 4 deletions

View file

@ -108,7 +108,7 @@ int drtm_setup(void)
plat_drtm_get_imp_def_dlme_region_size();
dlme_data_min_size += dlme_data_hdr_init.dlme_addr_map_size +
PLAT_DRTM_EVENT_LOG_MAX_SIZE +
ARM_DRTM_MIN_EVENT_LOG_SIZE +
dlme_data_hdr_init.dlme_tcb_hashes_table_size +
dlme_data_hdr_init.dlme_impdef_region_size;
@ -282,9 +282,9 @@ static enum drtm_retc drtm_dl_prepare_dlme_data(const struct_drtm_dl_args *args)
/* Prepare DRTM event log for DLME. */
drtm_serialise_event_log(dlme_data_cursor, &serialised_bytes_actual);
assert(serialised_bytes_actual <= PLAT_DRTM_EVENT_LOG_MAX_SIZE);
dlme_data_hdr->dlme_tpm_log_size = serialised_bytes_actual;
dlme_data_cursor += serialised_bytes_actual;
assert(serialised_bytes_actual <= ARM_DRTM_MIN_EVENT_LOG_SIZE);
dlme_data_hdr->dlme_tpm_log_size = ARM_DRTM_MIN_EVENT_LOG_SIZE;
dlme_data_cursor += dlme_data_hdr->dlme_tpm_log_size;
/*
* TODO: Prepare the TCB hashes for DLME, currently its size

View file

@ -36,6 +36,11 @@
#define DL_ARGS_GET_DLME_ENTRY_POINT(a) \
(((a)->dlme_paddr + (a)->dlme_img_off + (a)->dlme_img_ep_off))
/*
* Minimum size of Event Log in DLME data (64 KiB)
*/
#define ARM_DRTM_MIN_EVENT_LOG_SIZE U(0x10000)
/*
* Range(Min/Max) of DRTM parameter structure versions supported
*/