summaryrefslogtreecommitdiff
path: root/common/tpm_registers.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/tpm_registers.c')
-rw-r--r--common/tpm_registers.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/common/tpm_registers.c b/common/tpm_registers.c
index db2cba9b88..2bea30bb29 100644
--- a/common/tpm_registers.c
+++ b/common/tpm_registers.c
@@ -436,6 +436,9 @@ void tpm_register_put(uint32_t regaddr, const uint8_t *data, uint32_t data_size)
{
uint32_t i;
+ if (reset_in_progress)
+ return;
+
CPRINTF("%s(0x%03x, %d,", __func__, regaddr, data_size);
for (i = 0; i < data_size && i < 4; i++)
CPRINTF(" %02x", data[i]);
@@ -510,8 +513,6 @@ void tpm_register_get(uint32_t regaddr, uint8_t *dest, uint32_t data_size)
{
int i;
- reset_in_progress = 0;
-
CPRINTF("%s(0x%06x, %d)", __func__, regaddr, data_size);
switch (regaddr) {
case TPM_DID_VID:
@@ -883,6 +884,8 @@ static void tpm_reset_now(int wipe_first)
*/
hook_call_deferred(&reinstate_nvmem_commits_data, 3 * SECOND);
+ reset_in_progress = 0;
+
if_start();
}