diff options
| author | Nick Bofferding <bofferdn@us.ibm.com> | 2018-08-31 13:52:04 -0500 |
|---|---|---|
| committer | Nicholas E. Bofferding <bofferdn@us.ibm.com> | 2018-09-04 16:06:41 -0500 |
| commit | bdb1634e8e6a385884025f49cadbd4262962dd3e (patch) | |
| tree | 7e0c57352b02f19cdf1337467e1d23a0012b6fc7 /src | |
| parent | 9da5e1b9a7b18b648712ae34f870003c9c497278 (diff) | |
| download | talos-hostboot-bdb1634e8e6a385884025f49cadbd4262962dd3e.tar.gz talos-hostboot-bdb1634e8e6a385884025f49cadbd4262962dd3e.zip | |
Delete non-terminating TPM error in fabric integration step
Deletes a non-terminating TPM error in the fabric integration step to
avoid setting up a race condition on FSP that results in FSP not waking
Hostboot up from winkle properly. That issue will be pervasively addressed by
SW444320.
Change-Id: I1f43f704a53ec77593d082021cc545e2365d499a
CQ: SW443597
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65594
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/secureboot/node_comm/node_comm_exchange.C | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/usr/secureboot/node_comm/node_comm_exchange.C b/src/usr/secureboot/node_comm/node_comm_exchange.C index 78521b0e4..3b49f73dd 100644 --- a/src/usr/secureboot/node_comm/node_comm_exchange.C +++ b/src/usr/secureboot/node_comm/node_comm_exchange.C @@ -198,7 +198,16 @@ errlHndl_t nodeCommAbusGetRandom(uint64_t & o_nonce) err->collectTrace(SECURE_COMP_NAME); err->collectTrace(NODECOMM_TRACE_NAME); err->collectTrace(TRBOOT_COMP_NAME); - errlCommit(err, SECURE_COMP_ID); + + // @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); } TRACFCOMP(g_trac_nc,EXIT_MRK"nodeCommAbusGetRandom: " |
