From 5004e930532245339cf1165dcdff40b5f1824d1d Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Thu, 8 Sep 2022 11:04:10 +1000 Subject: [PATCH] Revert "drivers/mrc_cache: Don't compute checksum if TPM hash is used" This reverts commit f83b7d494e3ceb6bec11027ae5f21999ee5ad196. It turns out we have tests which use `futility validate_rec_mrc` to validate the MRC cache, which includes verifying the data checksum. Revert this to allow the tests to pass while we figure out how to fix this. BUG=b:245277259, b:242667207 TEST=None Signed-off-by: Reka Norman Change-Id: Id913d00584444c21cb94668bdc96f4de51af7cee Reviewed-on: https://review.coreboot.org/c/coreboot/+/67432 Tested-by: build bot (Jenkins) Reviewed-by: Kangheui Won Reviewed-by: Tim Wawrzynczak Reviewed-by: Angel Pons --- src/drivers/mrc_cache/mrc_cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c index b2d2e4b618..473d78c9a2 100644 --- a/src/drivers/mrc_cache/mrc_cache.c +++ b/src/drivers/mrc_cache/mrc_cache.c @@ -693,10 +693,10 @@ int mrc_cache_stash_data(int type, uint32_t version, const void *data, .signature = MRC_DATA_SIGNATURE, .data_size = size, .version = version, + .data_checksum = compute_ip_checksum(data, size), }; - if (!CONFIG(MRC_SAVE_HASH_IN_TPM)) - md.data_checksum = compute_ip_checksum(data, size); - md.header_checksum = compute_ip_checksum(&md, sizeof(md)); + md.header_checksum = + compute_ip_checksum(&md, sizeof(md)); if (CONFIG(MRC_STASH_TO_CBMEM)) { /* Store data in cbmem for use in ramstage */