Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/27726 )
Change subject: security/tpm: Use unique CBMEM names for TCPA logs ......................................................................
security/tpm: Use unique CBMEM names for TCPA logs
Fix regression introduced in commit f18dc5c7 "Add TCPA logging functionality":
Introduced TCPA log got overwritten in acpi.c of x86/arch, due to CBMEM name collision. Use a different cbmem name to have two independent TCPA logs.
Change-Id: Iac63ac26989080a401aac2273265a263a3fdec56 Signed-off-by: Philipp Deppenwiese zaolin@das-labor.org Reviewed-on: https://review.coreboot.org/27726 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Rudolph siro@das-labor.org --- M src/arch/x86/acpi.c M src/commonlib/include/commonlib/cbmem_id.h 2 files changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 60d2879..8d7579d 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -260,14 +260,14 @@ const struct cbmem_entry *ce; const u32 tcpa_default_log_len = 0x10000; void *lasa; - ce = cbmem_entry_find(CBMEM_ID_TCPA_LOG); + ce = cbmem_entry_find(CBMEM_ID_TCPA_TCG_LOG); if (ce) { lasa = cbmem_entry_start(ce); *size = cbmem_entry_size(ce); printk(BIOS_DEBUG, "TCPA log found at %p\n", lasa); return lasa; } - lasa = cbmem_add(CBMEM_ID_TCPA_LOG, tcpa_default_log_len); + lasa = cbmem_add(CBMEM_ID_TCPA_TCG_LOG, tcpa_default_log_len); if (!lasa) { printk(BIOS_ERR, "TCPA log creation failed\n"); return NULL; diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h index cc2fed1..287de1d 100644 --- a/src/commonlib/include/commonlib/cbmem_id.h +++ b/src/commonlib/include/commonlib/cbmem_id.h @@ -64,7 +64,7 @@ #define CBMEM_ID_STAGEx_RAW 0x57a9e200 #define CBMEM_ID_STORAGE_DATA 0x53746f72 #define CBMEM_ID_TCPA_LOG 0x54435041 -#define CBMEM_ID_TCPA_COMPLIANT_LOG 0x54445041 +#define CBMEM_ID_TCPA_TCG_LOG 0x54445041 #define CBMEM_ID_TIMESTAMP 0x54494d45 #define CBMEM_ID_VBOOT_HANDOFF 0x780074f0 #define CBMEM_ID_VBOOT_SEL_REG 0x780074f1 @@ -121,7 +121,7 @@ { CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \ { CBMEM_ID_STORAGE_DATA, "SD/MMC/eMMC" }, \ { CBMEM_ID_TCPA_LOG, "TCPA LOG " }, \ - { CBMEM_ID_TCPA_COMPLIANT_LOG, "TCPA COMPLIANT LOG " }, \ + { CBMEM_ID_TCPA_TCG_LOG, "TCPA TCGLOG" }, \ { CBMEM_ID_TIMESTAMP, "TIME STAMP " }, \ { CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \ { CBMEM_ID_VBOOT_SEL_REG, "VBOOT SEL " }, \