summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2019-05-24 17:22:13 -0700
committerVadim Bendebury <vbendeb@chromium.org>2019-09-21 19:11:24 -0700
commitde5eae8b652cbfaee25e8e160572b4592be7a80f (patch)
tree44bdc9c16807c1882de9f1d22165e4e0ad3877e3
parentdf87a37cf5e73b37c0d53aaf4a835c9323896ecd (diff)
downloadchrome-ec-de5eae8b652cbfaee25e8e160572b4592be7a80f.tar.gz
cr50: do not save NVMEM when disabling TPM
When TPM is disabled we do not want to invalidate the NVMEM contents in the flash, only the SRAM cache needs to be wiped out. BRANCH=cr50, cr50-mp BUG=b:132973320 TEST=make buildall -j Change-Id: Id05c341ee012ee1daa843c97166bde7c6c327bb6 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1636676 Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org> Reviewed-by: Namyoon Woo <namyoon@chromium.org> (cherry picked from commit 427019282c43804c9ce859c59f9ed14ee991719d) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1657312 (cherry picked from commit e5b180e36f77ec9a9dcca5061d9b0727c60c397a) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1705727 (cherry picked from commit 0afe957bd7e7636a65e809b44e084e87fc1ed9ae)
-rw-r--r--board/cr50/tpm2/nvmem_ops.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/board/cr50/tpm2/nvmem_ops.c b/board/cr50/tpm2/nvmem_ops.c
index 048b852732..4281d5f944 100644
--- a/board/cr50/tpm2/nvmem_ops.c
+++ b/board/cr50/tpm2/nvmem_ops.c
@@ -29,14 +29,4 @@ void nvmem_wipe_cache(void)
memset(&gp.phProof, 0, sizeof(gp.phProof));
memset(&gp.shProof, 0, sizeof(gp.shProof));
memset(&gp.ehProof, 0, sizeof(gp.ehProof));
-
- NvWriteReserved(NV_OWNER_AUTH, &gp.ownerAuth);
- NvWriteReserved(NV_ENDORSEMENT_AUTH, &gp.endorsementAuth);
- NvWriteReserved(NV_LOCKOUT_AUTH, &gp.lockoutAuth);
- NvWriteReserved(NV_EP_SEED, &gp.EPSeed);
- NvWriteReserved(NV_SP_SEED, &gp.SPSeed);
- NvWriteReserved(NV_PP_SEED, &gp.PPSeed);
- NvWriteReserved(NV_PH_PROOF, &gp.phProof);
- NvWriteReserved(NV_SH_PROOF, &gp.shProof);
- NvWriteReserved(NV_EH_PROOF, &gp.ehProof);
}