diff options
| author | Chris Engel <cjengel@us.ibm.com> | 2015-11-16 10:55:16 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-11-19 10:50:10 -0600 |
| commit | f1e68e784db481d111bd890409f7ca236923d5f6 (patch) | |
| tree | 68b68c42b56e66c36eedbd2ba965a42e9ec28a03 /src/usr/secureboot/trusted/trustedboot.C | |
| parent | b0751669bfae810059edfb430283365cdc75514f (diff) | |
| download | talos-hostboot-f1e68e784db481d111bd890409f7ca236923d5f6.tar.gz talos-hostboot-f1e68e784db481d111bd890409f7ca236923d5f6.zip | |
Trustedboot: Remove TPM 1.2 support
Change-Id: I2a8635f901e1473ffb81e92861a4b25a5d479095
RTC:125288
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22088
Tested-by: Jenkins Server
Reviewed-by: Timothy R. Block <block@us.ibm.com>
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot/trusted/trustedboot.C')
| -rw-r--r-- | src/usr/secureboot/trusted/trustedboot.C | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C index a80272be3..631448ad7 100644 --- a/src/usr/secureboot/trusted/trustedboot.C +++ b/src/usr/secureboot/trusted/trustedboot.C @@ -175,18 +175,8 @@ void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target, // Build our command block for a startup memset(dataBuf, 0, sizeof(dataBuf)); - TRUSTEDBOOT::TPM_BaseOut* resp = - (TRUSTEDBOOT::TPM_BaseOut*)dataBuf; -#ifdef CONFIG_TPMDD_1_2 - TRUSTEDBOOT::TPM_2ByteIn* cmd = - (TRUSTEDBOOT::TPM_2ByteIn*)dataBuf; - - cmd->base.tag = TRUSTEDBOOT::TPM_TAG_RQU_COMMAND; - cmd->base.paramSize = sizeof (TRUSTEDBOOT::TPM_2ByteIn); - cmd->base.ordinal = TRUSTEDBOOT::TPM_ORD_Startup; - cmd->param = TRUSTEDBOOT::TPM_ST_CLEAR; - cmdSize = cmd->base.paramSize; -#elif defined(CONFIG_TPMDD_2_0) + TRUSTEDBOOT::TPM2_BaseOut* resp = + (TRUSTEDBOOT::TPM2_BaseOut*)dataBuf; TRUSTEDBOOT::TPM2_2ByteIn* cmd = (TRUSTEDBOOT::TPM2_2ByteIn*)dataBuf; @@ -195,7 +185,6 @@ void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target, cmd->base.commandCode = TRUSTEDBOOT::TPM_CC_Startup; cmd->param = TRUSTEDBOOT::TPM_SU_CLEAR; cmdSize = cmd->base.commandSize; -#endif err = deviceRead(io_target.nodeTarget, &dataBuf, @@ -212,11 +201,11 @@ void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target, break; } - else if (TRUSTEDBOOT::TPM_SUCCESS != resp->returnCode) + else if (TRUSTEDBOOT::TPM_SUCCESS != resp->responseCode) { TRACFCOMP( g_trac_trustedboot, "TPM STARTUP OP Fail %X : ", - resp->returnCode); + resp->responseCode); /*@ * @errortype @@ -232,7 +221,7 @@ void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target, RC_TPM_START_FAIL, TARGETING::get_huid( io_target.nodeTarget), - resp->returnCode, + resp->responseCode, true /*Add HB SW Callout*/ ); err->collectTrace( SECURE_COMP_NAME ); |
