Pick up latest mss_eff_config HWP

  Implemented util functions getAllChips, getAllChiplets, getChildChiplets,
  getAffinityChips.

RTC: 41712

Change-Id: I625695a85d768e03365a91fb44b4f9d6525a4276
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1073
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 5 insertions, 15 deletions

diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
index 224536aa4..a2f2df13c 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
@@ -46,6 +46,7 @@
 
 //  targeting support
 #include    <targeting/common/commontargeting.H>
+#include    <targeting/common/utilFilter.H>
 
 //  fapi support
 #include    <fapi.H>
@@ -347,28 +348,17 @@ void    call_proc_fab_iovalid( void    *io_pArgs )
                "call_proc_fab_iovalid entry" );
 
     // Get all chip/chiplet targets
-    //  Use PredicateIsFunctional to filter only functional chips/chiplets
-    TARGETING::PredicateIsFunctional l_isFunctional;
-    //  filter for functional Chips/Chiplets
-    TARGETING::PredicateCTM l_Filter(CLASS_CHIP, TYPE_PROC);
-    // declare a postfix expression widget
-    TARGETING::PredicatePostfixExpr l_goodFilter;
-    //  is-a--chip  is-functional   AND
-    l_goodFilter.push(&l_Filter).push(&l_isFunctional).And();
-    // apply the filter through all targets.
-    TARGETING::TargetRangeFilter l_Procs(
-            TARGETING::targetService().begin(),
-            TARGETING::targetService().end(),
-            &l_goodFilter );
+    TARGETING::TargetHandleList l_cpuTargetList;
+    getAllChips(l_cpuTargetList, TYPE_PROC);
 
     std::vector<proc_fab_smp_proc_chip *> l_smp;
 
-    for ( ; l_Procs; ++l_Procs )
+    for ( size_t i = 0; i < l_cpuTargetList.size(); i++ )
     {
         proc_fab_smp_proc_chip *l_proc = new proc_fab_smp_proc_chip();
         l_smp.push_back( l_proc );
 
-        const TARGETING::Target * l_pTarget = *l_Procs;
+        const TARGETING::Target * l_pTarget = l_cpuTargetList[i];
         fapi::Target l_fapiproc_target( TARGET_TYPE_PROC_CHIP,
                        reinterpret_cast<void *>
                        (const_cast<TARGETING::Target*>(l_pTarget)) );