diff options
| author | Nicholas E. Bofferding <bofferdn@us.ibm.com> | 2018-09-05 11:19:31 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-10-02 08:59:15 -0500 |
| commit | 506a20f3bb46ce2033719354fdf7d8c3f146985e (patch) | |
| tree | 6ebe71b59b910d192b7082d1a98235aaf25c2c70 /src | |
| parent | 46b6d71b01b4936cfdf1e3236cde199a3940a231 (diff) | |
| download | talos-hostboot-506a20f3bb46ce2033719354fdf7d8c3f146985e.tar.gz talos-hostboot-506a20f3bb46ce2033719354fdf7d8c3f146985e.zip | |
Revert "Delete non-terminating TPM error in fabric integration step"
This reverts commit bdb1634e8e6a385884025f49cadbd4262962dd3e.
Change-Id: Idbe1edff3d3a241ff2002cf053b59095ea3cb524
CQ: SW446799
CMVC-Prereq: 1069262
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65708
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/secureboot/node_comm/node_comm_exchange.C | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/usr/secureboot/node_comm/node_comm_exchange.C b/src/usr/secureboot/node_comm/node_comm_exchange.C index 3b49f73dd..78521b0e4 100644 --- a/src/usr/secureboot/node_comm/node_comm_exchange.C +++ b/src/usr/secureboot/node_comm/node_comm_exchange.C @@ -198,16 +198,7 @@ errlHndl_t nodeCommAbusGetRandom(uint64_t & o_nonce) err->collectTrace(SECURE_COMP_NAME); err->collectTrace(NODECOMM_TRACE_NAME); err->collectTrace(TRBOOT_COMP_NAME); - - // @TODO CQ: SW444320 - // - // Restore errlCommit of this error as part of the referenced - // defect fix. Until that fix is in place, committing an error - // in this path with the intent of continuing would set up a condition - // where FSP fails to wake Hostboot out of winkle state. - delete err; - err=nullptr; - //errlCommit(err, SECURE_COMP_ID); + errlCommit(err, SECURE_COMP_ID); } TRACFCOMP(g_trac_nc,EXIT_MRK"nodeCommAbusGetRandom: " |
