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, 7 insertions, 17 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
index d4525095e..fa39e9b26 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
@@ -45,6 +45,7 @@
 
 //  targeting support
 #include    <targeting/common/commontargeting.H>
+#include    <targeting/common/utilFilter.H>
 
 //  fapi support
 #include    <fapi.H>
@@ -158,7 +159,6 @@ errlHndl_t  loadPoreImage( TARGETING::Target    *i_CpuTarget,
 void    call_host_build_winkle( void    *io_pArgs )
 {
     errlHndl_t  l_errl  =   NULL;
-    TARGETING::TargetService&   l_targetService = targetService();
     uint8_t                     l_cpuNum        =   0;
 
     const char                  *l_pPoreImage   =   NULL;
@@ -176,24 +176,14 @@ void    call_host_build_winkle( void    *io_pArgs )
     //  customize any other inputs
     //  set up loops to go through all targets (if parallel, spin off a task)
 
-    //  Use PredicateIsFunctional to filter only functional chips
-    TARGETING::PredicateIsFunctional    l_isFunctional;
-
-    TARGETING::PredicateCTM         l_procChipFilter( CLASS_CHIP, TYPE_PROC );
-    TARGETING::PredicatePostfixExpr l_functionalAndProcChipFilter;
-    l_functionalAndProcChipFilter
-    .push(&l_procChipFilter)
-    .push(&l_isFunctional)
-    .And();
-    TARGETING::TargetRangeFilter    l_cpuFilter(
-                                               l_targetService.begin(),
-                                               l_targetService.end(),
-                                               &l_functionalAndProcChipFilter );
-
-    for ( l_cpuNum=0;   l_cpuFilter;    ++l_cpuFilter, l_cpuNum++ )
+
+    TARGETING::TargetHandleList l_cpuTargetList;
+    getAllChips(l_cpuTargetList, TYPE_PROC);
+
+    for ( l_cpuNum=0; l_cpuNum < l_cpuTargetList.size(); l_cpuNum++ )
     {
         //  make a local copy of the CPU target
-        TARGETING::Target*  l_cpu_target = *l_cpuFilter;
+        TARGETING::Target*  l_cpu_target = l_cpuTargetList[l_cpuNum];
 
         TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                    "Run cpuNum 0x%x",