summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorPrachi Gupta <pragupta@us.ibm.com>2018-03-27 10:11:46 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-04-12 15:29:18 -0400
commit8a1fb3c1378d63db8d50ea5cf65dcedf34dd5341 (patch)
tree7fb6f276d5e1c7fe3a8d305e98ddceac9ff57bdb /src/usr
parenta615e9ba098241d7662484cf1f7459e6e989937f (diff)
downloadtalos-hostboot-8a1fb3c1378d63db8d50ea5cf65dcedf34dd5341.tar.gz
talos-hostboot-8a1fb3c1378d63db8d50ea5cf65dcedf34dd5341.zip
Remove logic to deconfigure PHBs in higher position within a pec
Current deconfig logic will deconfigure PHBs with a higher unit position under a given pec, if we were deconfiguring the PHB with a lower unit position. For example, PEC1 has PHB1 and PHB2. If we deconfigured PHB1, then we would by association deconfigure PHB2 as well. However, if we deconfigured PHB2, then we would not deconfigure PHB1. This commit removes the logic where if PHB2 is deconfigured, PHB1 is deconfigured as well. To summarize, the end result is to be able to deconfigure PHB1 or PHB2 with no effect on the other. HWPs will handle the hw limitations we have between PHBS. Change-Id: I95b31f4d051c15d896d18adf0a7f7c1b994f5928 CQ: SW417485 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56499 Reviewed-by: Martin Gloff <mgloff@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: William G. Hoffa <wghoffa@us.ibm.com> Reviewed-by: Roland Veloz <rveloz@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/hwas/common/deconfigGard.C24
-rw-r--r--src/usr/isteps/istep10/host_proc_pcie_scominit.C2
2 files changed, 1 insertions, 25 deletions
diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C
index 2e0383b91..805915f5a 100644
--- a/src/usr/hwas/common/deconfigGard.C
+++ b/src/usr/hwas/common/deconfigGard.C
@@ -1957,30 +1957,6 @@ void DeconfigGard::_deconfigureByAssoc(
_deconfigureByAssoc(*l_parentPEC,
i_errlEid,i_deconfigRule);
}
-
- // Due to shared resources, need to deconfig any PHB
- // with a higher unit position as the one that we just
- // lost
- ATTR_CHIP_UNIT_type l_myUnit =
- i_target.getAttr<ATTR_CHIP_UNIT>();
- TargetHandleList pChildList;
- targetService().getAssociated(pChildList,
- l_parentPEC,
- TargetService::CHILD,
- TargetService::ALL,
- &isFunctional);
-
- for (const auto & l_pChild: pChildList)
- {
- if( l_pChild->getAttr<ATTR_CHIP_UNIT>() > l_myUnit )
- {
- _deconfigureTarget(*l_pChild,
- i_errlEid, NULL,
- i_deconfigRule);
- _deconfigureByAssoc(*l_pChild,
- i_errlEid,i_deconfigRule);
- }
- }
}
break;
diff --git a/src/usr/isteps/istep10/host_proc_pcie_scominit.C b/src/usr/isteps/istep10/host_proc_pcie_scominit.C
index ff9075b4f..e1ffc0ac5 100644
--- a/src/usr/isteps/istep10/host_proc_pcie_scominit.C
+++ b/src/usr/isteps/istep10/host_proc_pcie_scominit.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016,2017 */
+/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
OpenPOWER on IntegriCloud