commit 51950398ff9192b96316781692af5e5b3be80aa0
author android-build-team Robot <android-build-team-robot@google.com> Thu Dec 14 08:31:08 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Dec 14 08:31:08 2017 +0000
tree 0dc4cb0d35448728234b51703717496e235020f3
parent 4a2d9ce75a15e238d71a7d6b6bf2ced18c493bb5
parent 77039dd71222236a5cc653a3953b0758039234d8

Snap for 4502278 from 77039dd71222236a5cc653a3953b0758039234d8 to pi-release

Change-Id: I9d040a9fce5e06614de06266fe5b44305b679029

Startup.c

diff --git a/Startup.c b/Startup.c
index 8759e52..053735c 100644
--- a/Startup.c
+++ b/Startup.c
@@ -163,5 +163,10 @@
    // The H-CRTM state no longer matters
    g_DrtmPreStartup = FALSE;
 
+#ifdef EMBEDDED_MODE
+   if (startup == SU_RESET)
+       _plat__ResetCallback();
+#endif
+
    return TPM_RC_SUCCESS;
 }

include/tpm2/Platform.h

diff --git a/include/tpm2/Platform.h b/include/tpm2/Platform.h
index f7bcbcd..4779594 100644
--- a/include/tpm2/Platform.h
+++ b/include/tpm2/Platform.h
@@ -384,6 +384,12 @@
       uint32_t          *fw2
 );
 
+// A function to call after every successful SU_RESET TPM2_Startup.
+LIB_EXPORT void
+_plat__ResetCallback(
+    void
+);
+
 int uart_printf(const char *format, ...);
 #define ecprintf(format, args...) uart_printf(format, ## args);