GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "drivers/mrc_cache: Don't compute checksum if TPM hash is used" 

This reverts commit f83b7d494e.

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 <rekanorman@chromium.org>
Change-Id: Id913d00584444c21cb94668bdc96f4de51af7cee
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67432
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Reka Norman 2022-09-08 11:04:10 +10:00 committed by Felix Held
parent b4b85ebf60
commit 5004e93053
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/mrc_cache/mrc_cache.c
View File

@ -693,10 +693,10 @@ int mrc_cache_stash_data(int type, uint32_t version, const void *data,
.signature = MRC_DATA_SIGNATURE, .signature = MRC_DATA_SIGNATURE,
.data_size = size, .data_size = size,
.version = version, .version = version,
.data_checksum = compute_ip_checksum(data, size),
}; };
if (!CONFIG(MRC_SAVE_HASH_IN_TPM)) md.header_checksum =
md.data_checksum = compute_ip_checksum(data, size); compute_ip_checksum(&md, sizeof(md));
md.header_checksum = compute_ip_checksum(&md, sizeof(md));
if (CONFIG(MRC_STASH_TO_CBMEM)) { if (CONFIG(MRC_STASH_TO_CBMEM)) {
/* Store data in cbmem for use in ramstage */ /* Store data in cbmem for use in ramstage */