From 506a20f3bb46ce2033719354fdf7d8c3f146985e Mon Sep 17 00:00:00 2001 From: "Nicholas E. Bofferding" Date: Wed, 5 Sep 2018 11:19:31 -0500 Subject: 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 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: William G. Hoffa --- src/usr/secureboot/node_comm/node_comm_exchange.C | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/usr/secureboot') 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: " -- cgit v1.2.1