diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2019-09-06 16:25:40 -0500 |
|---|---|---|
| committer | Christian R Geddes <crgeddes@us.ibm.com> | 2019-09-16 09:34:15 -0500 |
| commit | 147018379ad0056df157e44b569c3fe048deb37a (patch) | |
| tree | 090b6967b4aec99d0e0d38f04e71fb5e69ffda61 | |
| parent | fa1e0b1361abb4c6e48c24d58e5caed29288e4ed (diff) | |
| download | talos-hostboot-147018379ad0056df157e44b569c3fe048deb37a.tar.gz talos-hostboot-147018379ad0056df157e44b569c3fe048deb37a.zip | |
Skip OCMB targets while decidng what targets to process for IpmiFruInv
Some targets types will not have IPMI fru inventory classes associated
with them, attempting to process them will result in an assert.
Change-Id: I34cb080c981ac5d0008eb937c127e043ff077a27
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83433
Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
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: Christian R Geddes <crgeddes@us.ibm.com>
| -rw-r--r-- | src/usr/ipmiext/ipmifruinv.C | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/usr/ipmiext/ipmifruinv.C b/src/usr/ipmiext/ipmifruinv.C index e70d5afa0..a41d67394 100644 --- a/src/usr/ipmiext/ipmifruinv.C +++ b/src/usr/ipmiext/ipmifruinv.C @@ -7,8 +7,8 @@ /* */ /* Contributors Listed Below - COPYRIGHT 2014,2019 */ /* [+] International Business Machines Corp. */ -/* [+] Jim Yuan */ -/* [+] Maxim Polyakov */ +/* [+] Super Micro Computer, Inc. */ +/* [+] YADRO */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -2406,6 +2406,8 @@ void IPMIFRUINV::gatherSetData(const TARGETING::Target* i_pSys, TARGETING::PredicateCTM predChip(TARGETING::CLASS_CHIP); TARGETING::PredicateCTM predDimm(TARGETING::CLASS_LOGICAL_CARD, TARGETING::TYPE_DIMM); + TARGETING::PredicateCTM predOcmb(TARGETING::CLASS_CHIP, + TARGETING::TYPE_OCMB_CHIP); TARGETING::PredicatePostfixExpr checkExpr; TARGETING::PredicateHwas l_present; // @todo-RTC:124553 - Additional logic for deconfigured Frus @@ -2427,6 +2429,9 @@ void IPMIFRUINV::gatherSetData(const TARGETING::Target* i_pSys, checkExpr.push(&predDimm).Or().push(&l_present).And(); } + // We do NOT want to process fruInv for OCMB_CHIP targets + checkExpr.push(&predOcmb).Not().And(); + TARGETING::TargetHandleList pCheckPres; TARGETING::targetService().getAssociated( pCheckPres, i_pSys, TARGETING::TargetService::CHILD, TARGETING::TargetService::ALL, |
