Skip to content

Commit

Permalink
Revert "Delete non-terminating TPM error in fabric integration step"
Browse files Browse the repository at this point in the history
This reverts commit bdb1634.

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>
  • Loading branch information
Nicholas E. Bofferding authored and wghoffa committed Oct 2, 2018
1 parent 46b6d71 commit 506a20f
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions src/usr/secureboot/node_comm/node_comm_exchange.C
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down

0 comments on commit 506a20f

Please sign in to comment.