diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2018-11-08 11:55:28 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-11-12 09:41:19 -0600 |
| commit | 4694514bf5ce31360f0e9614ac287509c4c5b834 (patch) | |
| tree | 1f482aee7bb6e4ed2878513d66f6324042843234 /src/usr/ipmiext | |
| parent | 2e77a7fb14331b3d734aad3d500732dd51dcb32e (diff) | |
| download | talos-hostboot-4694514bf5ce31360f0e9614ac287509c4c5b834.tar.gz talos-hostboot-4694514bf5ce31360f0e9614ac287509c4c5b834.zip | |
Zero out TPM FRU ID to avoid hostboot crash
This change allows us to update the MRW with the TPM FRU ID while
ignoring its value in hostboot to avoid crashing. In a later commit
we will handle the FRU ID properly.
Change-Id: Iefef07f9db36f22581423e8a0cf61f1b0a034d1f
RTC:194318
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68543
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/ipmiext')
| -rw-r--r-- | src/usr/ipmiext/ipmifruinv.C | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/usr/ipmiext/ipmifruinv.C b/src/usr/ipmiext/ipmifruinv.C index e3518e20a..62c2ff9c3 100644 --- a/src/usr/ipmiext/ipmifruinv.C +++ b/src/usr/ipmiext/ipmifruinv.C @@ -2306,6 +2306,16 @@ void IPMIFRUINV::gatherSetData(const TARGETING::Target* i_pSys, TARGETING::TargetHandle_t pTarget = *pTarget_it; uint32_t l_fruId = pTarget->getAttr<TARGETING::ATTR_FRU_ID>(); + // Check if this is a tpm target, if so zero out the fru entry for now + // until we are ready to handle it. The reason we can't handle it is + // because it doesn't exist in the MRW yet. But if we add it, then + // then hostboot will crash. This helps escape the chicken/egg scenario. + // TODO RTC 194318 - remove later as a second step + if (TARGETING::TYPE_TPM == pTarget->getAttr<TARGETING::ATTR_TYPE>()) + { + l_fruId = 0; + } + // check if this is a membuf target, if it is and the special // attribute to say we want a separate fru entry for the centaur ecids // is populated, then we will push that ecid to the potential frus |
