diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2019-02-19 10:55:19 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-03-05 08:53:09 -0600 |
| commit | d74d3932d989bca5b533c48024ac135ec9991d64 (patch) | |
| tree | c6ef9e1e29a5d6a5397eef5f4c9b1586d3d24379 /src/usr/i2c | |
| parent | eeb5732a169d35955e96236f6389e95a29a22af8 (diff) | |
| download | talos-hostboot-d74d3932d989bca5b533c48024ac135ec9991d64.tar.gz talos-hostboot-d74d3932d989bca5b533c48024ac135ec9991d64.zip | |
Secureboot: Enhance Error Callouts For New Multinode Trustedboot Transfer
This commit adds many checks to callout potential issues with the new
multinode trustedboot transfer protocol. It also improves some
TPM-related traces.
Change-Id: Ice3f8be0668cc63321eeb2562bb8ffe610284b6a
RTC:203642
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72363
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@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>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/i2c')
| -rwxr-xr-x | src/usr/i2c/tpmdd.C | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/usr/i2c/tpmdd.C b/src/usr/i2c/tpmdd.C index 11b14aa80..a6f96514b 100755 --- a/src/usr/i2c/tpmdd.C +++ b/src/usr/i2c/tpmdd.C @@ -693,7 +693,8 @@ bool tpmPresence (TARGETING::Target* i_pTpm) ERRORLOG::ErrlUserDetailsTarget(i_pTpm).addToLog(pError); - const auto plid = pError->plid(); + const auto original_eid = pError->eid(); + const auto original_plid = pError->plid(); pError->setSev(ERRORLOG::ERRL_SEV_UNRECOVERABLE); errlCommit(pError,TPMDD_COMP_ID); @@ -721,9 +722,16 @@ bool tpmPresence (TARGETING::Target* i_pTpm) get_huid(i_pTpm), 0, ERRORLOG::ErrlEntry::NO_SW_CALLOUT); - pError->plid(plid); + pError->plid(original_plid); ERRORLOG::ErrlUserDetailsTarget(i_pTpm).addToLog(pError); + TRACFCOMP(g_trac_tpmdd, ERR_MRK + "tpmPresence: Due to Error eid=0x%.8X plid=0x%.8X involving " + "TPM with HUID=0x%08X, committing Unrecoverable Error " + "eid=0x%.8X with same plid=0x%.8X", + original_eid, original_plid, TARGETING::get_huid(i_pTpm), + pError->eid(), pError->plid()); + // Hardware/Procedure callouts/trace should have been added to the // original log but the main HW/SW callouts/traces are replicated here // just in case. @@ -1852,7 +1860,7 @@ errlHndl_t tpmReadAttributes ( TARGETING::Target * i_target, // Printing mux info separately, if combined, nothing is displayed char* l_muxPath = io_tpmInfo.i2cMuxPath.toString(); - TRACFCOMP(g_trac_tpmdd, "tpmReadAttributes(): " + TRACUCOMP(g_trac_tpmdd, "tpmReadAttributes(): " "muxSelector=0x%X, muxPath=%s", io_tpmInfo.i2cMuxBusSelector, l_muxPath); |
