HWPF Error XML: Allow callout/deconfigure/gard of DIMM(s) related to MBA

Change-Id: Ibd067f73cf381b18eab5e48cf1f72f961450a1f2
RTC:81669
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6208
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 18 insertions, 8 deletions

diff --git a/src/usr/hwpf/test/fapiRcTest.C b/src/usr/hwpf/test/fapiRcTest.C
index 1de3728a1..0e9949924 100644
--- a/src/usr/hwpf/test/fapiRcTest.C
+++ b/src/usr/hwpf/test/fapiRcTest.C
@@ -640,7 +640,7 @@ uint32_t rcTest12()
     l_entries[3].target_cdg.iv_gard = 0;
     l_entries[3].target_cdg.iv_calloutPriority = fapi::CalloutPriorities::HIGH;
     l_entries[4].iv_type = fapi::ReturnCode::EI_TYPE_CHILDREN_CDG;
-    l_entries[4].children_cdg.iv_parentChipObjIndex = 1;
+    l_entries[4].children_cdg.iv_parentObjIndex = 1;
     l_entries[4].children_cdg.iv_callout = 0;
     l_entries[4].children_cdg.iv_deconfigure = 1;
     l_entries[4].children_cdg.iv_childType = fapi::TARGET_TYPE_ABUS_ENDPOINT;
@@ -804,7 +804,7 @@ uint32_t rcTest12()
             break;
         }
 
-        if (l_pErrInfo->iv_childrenCDGs[0]->iv_parentChip != l_target)
+        if (l_pErrInfo->iv_childrenCDGs[0]->iv_parent != l_target)
         {
             FAPI_ERR("rcTest12. parent chip mismatch");
             l_result = 19;
@@ -1174,7 +1174,7 @@ uint32_t rcTest16()
     l_entries[7].bus_callout.iv_endpoint2ObjIndex = 3;
     l_entries[7].bus_callout.iv_calloutPriority = fapi::CalloutPriorities::HIGH;
     l_entries[8].iv_type = fapi::ReturnCode::EI_TYPE_CHILDREN_CDG;
-    l_entries[8].children_cdg.iv_parentChipObjIndex = 2;
+    l_entries[8].children_cdg.iv_parentObjIndex = 2;
     l_entries[8].children_cdg.iv_callout = 1;
     l_entries[8].children_cdg.iv_deconfigure = 1;
     l_entries[8].children_cdg.iv_childType = fapi::TARGET_TYPE_ABUS_ENDPOINT;
@@ -1182,7 +1182,7 @@ uint32_t rcTest16()
     l_entries[8].children_cdg.iv_calloutPriority =
         fapi::CalloutPriorities::HIGH;
     l_entries[9].iv_type = fapi::ReturnCode::EI_TYPE_CHILDREN_CDG;
-    l_entries[9].children_cdg.iv_parentChipObjIndex = 3;
+    l_entries[9].children_cdg.iv_parentObjIndex = 3;
     l_entries[9].children_cdg.iv_callout = 1;
     l_entries[9].children_cdg.iv_deconfigure = 0;
     l_entries[9].children_cdg.iv_childType = fapi::TARGET_TYPE_MBA_CHIPLET;
@@ -1436,7 +1436,7 @@ uint32_t rcTest16()
             break;
         }
 
-        if (l_pErrInfo->iv_childrenCDGs[0]->iv_parentChip != l_target)
+        if (l_pErrInfo->iv_childrenCDGs[0]->iv_parent != l_target)
         {
             FAPI_ERR("rcTest16. parent chip mismatch 1");
             l_result = 31;
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index fc2f9e584..c1f2a8157 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -198,16 +198,25 @@ public:
         // Create a FAPI Target and invoke the hwpTestError HWP. The HWP
         // returns an error to test out error handling
         fapi::Target l_fapiTarget(TARGET_TYPE_PROC_CHIP,
-                                  reinterpret_cast<void *> (l_pTarget));
+                reinterpret_cast<void *> (l_pTarget));
+
+        TARGETING::TargetHandleList l_mbaTargetList;
+        TARGETING::getAllChiplets(l_mbaTargetList, TARGETING::TYPE_MBA);
 
-        FAPI_INVOKE_HWP(l_err, hwpTestError, l_fapiTarget);
+        // just grab the first one in the list.
+        TARGETING::Target * l_mbaTarget = l_mbaTargetList[0];
+        // Cast to a FAPI type of target.
+        fapi::Target l_fapiMbaTarget( fapi::TARGET_TYPE_MBA_CHIPLET,
+                (reinterpret_cast<void *>( l_mbaTarget)) );
+
+        FAPI_INVOKE_HWP(l_err, hwpTestError, l_fapiTarget, l_fapiMbaTarget);
 
         if (l_err)
         {
             // Delete the error rather than committing it to avoid it getting
             // interpreted as a real problem
             TS_TRACE("testHwpf2: Unit Test passed. "
-                     "hwpTestError failed. Error deleted");
+                    "hwpTestError failed. Error deleted");
             delete l_err;
             l_err = NULL;
         }
@@ -895,6 +904,7 @@ public:
 
         } while(0);
     }
+
 };
 
 #endif