cr50: Avoiding nvram commits at startup

This patch eliminates NVMEM commits at system startup, namely between
the moment the TPM is reset and the moment the AP is trying to read a
PCR (which is an indication of the AP having booted into OS).

To avoid losing NVMEM changes in case TPM is reset before PCR Read
command is issued, pending changes (if any) are saved before TPM reset
is processed.

For the same reason TPM reset invocation is being added to the hard
reboot path; this will kick in when there is a restart after cr50
firmware update.

BRANCH=none
BUG=chrome-os-partner:59873
TEST=with instrumented coreboot/depthcharge observed the following
     execution times for various TPM command issued at startup

  command 0x144, 15203 us
  command 0x14e, 11814 us
  command 0x182, 12461 us
  command 0x182, 12456 us
  command 0x138, 11503 us
  command 0x138, 11512 us
  command 0x14e, 14648 us
  command 0x14e, 12597 us
  command 0x121, 11353 us

    which totals 113 ms and shaves more than 200 ms off the boot time.

Change-Id: Ic52309291fdb9c3ede96e0ad015ad9fc076bddc5
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/424063
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>

1 files changed, 32 insertions, 0 deletions

diff --git a/common/nvmem.c b/common/nvmem.c
index ffdb78bb2d..a93852191c 100644
--- a/common/nvmem.c
+++ b/common/nvmem.c
@@ -45,6 +45,9 @@ struct nvmem_cache {
 
 struct nvmem_cache cache;
 
+static uint8_t commits_enabled;
+static uint8_t commits_skipped;
+
 /* NvMem error state */
 static int nvmem_error_state;
 /* Flag to track if an Nv write/move is not completed */
@@ -375,6 +378,9 @@ int nvmem_init(void)
 	}
 
 	CPRINTS("Active NVram partition set to %d", nvmem_act_partition);
+	commits_enabled = 1;
+	commits_skipped = 0;
+
 	return EC_SUCCESS;
 }
 
@@ -510,6 +516,26 @@ int nvmem_move(uint32_t src_offset, uint32_t dest_offset, uint32_t size,
 	return EC_SUCCESS;
 }
 
+void nvmem_enable_commits(void)
+{
+	if (commits_enabled)
+		return;
+
+	commits_enabled = 1;
+	if (!commits_skipped)
+		return;
+
+	CPRINTS("Committing NVMEM changes.");
+	nvmem_commit();
+	commits_skipped = 0;
+}
+
+void nvmem_disable_commits(void)
+{
+	commits_enabled = 0;
+	commits_skipped = 0;
+}
+
 int nvmem_commit(void)
 {
 	int nvmem_offset;
@@ -517,6 +543,12 @@ int nvmem_commit(void)
 	uint16_t version;
 	struct nvmem_partition *p_part;
 
+	if (!commits_enabled) {
+		commits_skipped = 1;
+		CPRINTS("Skipping commit");
+		return EC_SUCCESS;
+	}
+
 	/* Ensure that all writes/moves prior to commit call succeeded */
 	if (nvmem_write_error) {
 		CPRINTS("NvMem: Write Error, commit abandoned");