HWPF: Add FAPI Attr Sync Functionality and enable FSP-HB Attr Overrides

Change-Id: I64939aa0655659e48400bca0c4aa09afe333889c
RTC: 46992
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2397
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 42 insertions, 2 deletions

diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index 07d00044d..2f8ce4195 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -252,13 +252,53 @@ public:
 
     /**
      * @brief Test HWPF Attributes: call a test procedure that exercises
-     *        the FAPI scratch attributes
+     *        FAPI attributes
      */
     void testHwpf4()
     {
         errlHndl_t l_err = NULL;
 
-        FAPI_INVOKE_HWP(l_err, hwpTestAttributes);
+        // Get the first MBA chiplet
+        fapi::Target l_mbaChiplet;
+        {
+        TARGETING::PredicateCTM l_pred(TARGETING::CLASS_UNIT, TARGETING::TYPE_MBA);
+        TARGETING::TargetRangeFilter l_filter(TARGETING::targetService().begin(),
+                                              TARGETING::targetService().end(),
+                                              &l_pred);
+        if (l_filter)
+        {
+            l_mbaChiplet.setType(fapi::TARGET_TYPE_MBA_CHIPLET);
+            l_mbaChiplet.set(*l_filter);
+        }
+        else
+        {
+            FAPI_ERR("testHwpf4: No MBAs found");
+            TS_FAIL("testHwpf4: No MBAs found");
+            return;
+        }
+        }
+
+        // Get the first proc chip
+        fapi::Target l_procChip;
+        {
+        TARGETING::PredicateCTM l_pred(TARGETING::CLASS_CHIP, TARGETING::TYPE_PROC);
+        TARGETING::TargetRangeFilter l_filter(TARGETING::targetService().begin(),
+                                              TARGETING::targetService().end(),
+                                              &l_pred);
+        if (l_filter)
+        {
+            l_procChip.setType(fapi::TARGET_TYPE_PROC_CHIP);
+            l_procChip.set(*l_filter);
+        }
+        else
+        {
+            FAPI_ERR("testHwpf4: No proc chips found");
+            TS_FAIL("testHwpf4: No proc chips found");
+            return;
+        }
+        }
+
+        FAPI_INVOKE_HWP(l_err, hwpTestAttributes, l_mbaChiplet, l_procChip);
 
         if (l_err)
         {