From e24bd63fae46ca1abe1d58257f3dbfe924e9a94b Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 17 Aug 2017 20:09:14 -0700 Subject: [PATCH] cr50: log tpm reset event Use the previously introduced TPM logging framework to log TPM reset events. The two lowest data field bits are used to communicate the type of reset passed to tpm_reset_request(), BRANCH=cr50 BUG=b:63760920 TEST=with the upcoming patches verified that TPM initialization is logged as expected Change-Id: Ic0874723ec6df616a8237b036542398b29fe5ccc Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/620113 Reviewed-by: Mary Ruthven Reviewed-by: Shawn N --- board/cr50/board.h | 2 ++ common/tpm_registers.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/board/cr50/board.h b/board/cr50/board.h index db47101953..27faa9341a 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -146,6 +146,8 @@ /* Implement custom udelay, due to usec hwtimer imprecision. */ #define CONFIG_HW_SPECIFIC_UDELAY +#define CONFIG_TPM_LOGGING + #ifndef __ASSEMBLER__ #include "gpio_signal.h" diff --git a/common/tpm_registers.c b/common/tpm_registers.c index b8d522a460..619bfb669b 100644 --- a/common/tpm_registers.c +++ b/common/tpm_registers.c @@ -20,6 +20,7 @@ #include "system.h" #include "system_chip.h" #include "task.h" +#include "tpm_log.h" #include "tpm_manufacture.h" #include "tpm_registers.h" #include "util.h" @@ -696,6 +697,10 @@ int tpm_reset_request(int wait_until_done, int wipe_nvmem_first) return EC_ERROR_BUSY; } + /* Record input parameters as two bits in the data field. */ + tpm_log_event(TPM_EVENT_INIT, + (!!wait_until_done << 1) | !!wipe_nvmem_first); + reset_in_progress = 1; wipe_result = EC_SUCCESS;