summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2016-02-04 15:59:13 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-02-05 06:02:46 -0800
commitc68e5a7c9bc0c1ae131303a41e51b6e13ca25e31 (patch)
tree5abc2c926c93d00a0fd8b13cbd911f276b650763
parentff52ac20c1603317f601af73076179da06b3a909 (diff)
downloadchrome-ec-c68e5a7c9bc0c1ae131303a41e51b6e13ca25e31.tar.gz
CR50: Add initialization code required by TPM2 compliance tests.
BRANCH=none BUG=chrome-os-partner:43025,chrome-os-partner:47524,chrome-os-partner:50115 TEST=initial TPM2 tests pass Change-Id: Ie614f29e578fb177245c33e6d1a896534a8d6095 Signed-off-by: nagendra modadugu <ngm@google.com> Reviewed-on: https://chromium-review.googlesource.com/326180 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
-rw-r--r--common/tpm_registers.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/tpm_registers.c b/common/tpm_registers.c
index 66e8628a28..68a7bff4cb 100644
--- a/common/tpm_registers.c
+++ b/common/tpm_registers.c
@@ -20,6 +20,7 @@
#include "ExecCommand_fp.h"
#include "Platform.h"
#include "_TPM_Init_fp.h"
+#include "Manufacture_fp.h"
#define CPRINTS(format, args...) cprints(CC_TPM, format, ## args)
#define CPRINTF(format, args...) cprintf(CC_TPM, format, ## args)
@@ -407,6 +408,9 @@ static void tpm_init(void)
/* TPM2 library functions. */
_plat__Signal_PowerOn();
+ /* TODO(ngm): CRBUG/50115, initialize state expected by TPM2
+ * compliance tests. */
+ TPM_Manufacture(1);
_TPM_Init();
_plat__SetNvAvail();
}