Preload PNOR VPD correctly

	- Handle Venice, Murano, Tuleta
	- Change SPD code to use VPD_REC_NUM attribute
	- Modify FAPI/HWPF tests to use present DIMM targets

Change-Id: I2348a2da90ea85a966f3724f8b3694a0b8f03916
RTC: 40774
Depends-on: I7d1b41c9f9e87baa9d42b78bf4351e3b6d774cb5 RTC: 39133
Depends-on: Ia0f22c87f8bc3959324fa8347e191f2b47b4325c RTC: 35835
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/950
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 6 insertions, 23 deletions

diff --git a/src/usr/spd/spd.C b/src/usr/spd/spd.C
index 3d7f34eb3..e472d7885 100755
--- a/src/usr/spd/spd.C
+++ b/src/usr/spd/spd.C
@@ -968,15 +968,8 @@ errlHndl_t getVpdLocation ( int64_t & o_vpdLocation,
     TRACSSCOMP( g_trac_spd,
                 ENTER_MRK"getVpdLocation()" );
 
-    // TODO - Story 39133 is complete.  And thus we should be able to use the
-    // VPD_REC_NUM attribute.  But Simics is still in the process of changing
-    // their plugging order.  Thus, there are most likely tweaks that still
-    // need to be done to the VPD preload script, as well as the system
-    // attribute xml files.  Once Simics is done, then we can step back and
-    // see exactly what part(s) need to be modified to accomodate.
-//    o_vpdLocation = i_target->getAttr<TARGETING::ATTR_VPD_REC_NUM>();
-    o_vpdLocation = 0;
-    TRACFCOMP( g_trac_spd,
+    o_vpdLocation = i_target->getAttr<TARGETING::ATTR_VPD_REC_NUM>();
+    TRACUCOMP( g_trac_spd,
                INFO_MRK"Using VPD location: %d",
                o_vpdLocation );
 
diff --git a/src/usr/spd/test/spdtest.H b/src/usr/spd/test/spdtest.H
index 7caee42a7..e00abe773 100755
--- a/src/usr/spd/test/spdtest.H
+++ b/src/usr/spd/test/spdtest.H
@@ -36,6 +36,7 @@
 #include <errl/errlentry.H>
 #include <devicefw/driverif.H>
 #include <targeting/common/predicates/predicates.H>
+#include <targeting/common/utilFilter.H>
 
 #include <spd/spdreasoncodes.H>
 #include <spd/spdenums.H>
@@ -49,20 +50,9 @@ using namespace SPD;
 
 void getDIMMTargets ( TargetHandleList & o_dimmList )
 {
-    // Get top level system target
-    TARGETING::TargetService& tS = TARGETING::targetService();
-    TARGETING::Target * sysTarget = NULL;
-    tS.getTopLevelTarget( sysTarget );
-    assert( sysTarget != NULL );
-
-    // Get a DIMM Target
-    TARGETING::PredicateCTM predDimm( TARGETING::CLASS_LOGICAL_CARD,
-                                      TARGETING::TYPE_DIMM );
-    tS.getAssociated( o_dimmList,
-                      sysTarget,
-                      TARGETING::TargetService::CHILD,
-                      TARGETING::TargetService::ALL,
-                      &predDimm );
+    // Get Dimm list.
+    getAllLogicalCards( o_dimmList,
+                        TARGETING::TYPE_DIMM );
     TRACDCOMP( g_trac_spd,
                "getDIMMTargets() - found %d DIMMs",
                o_dimmList.size() );