Add support for getTarget<T>(type, instance)

    -Add function to convert an arbitrary target type and instance
     into a fapi2 target type.

Change-Id: I41a70a881160bebeeac97ff4e8b74c002d6224d8
Depends-on: I1de1da708146427ada3f9cc4e1977dd608172cf4
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28107
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 139 insertions, 78 deletions

diff --git a/src/usr/fapi2/test/fapi2GetTargetTest.H b/src/usr/fapi2/test/fapi2GetTargetTest.H
index 7bff395bb..24e08f484 100644
--- a/src/usr/fapi2/test/fapi2GetTargetTest.H
+++ b/src/usr/fapi2/test/fapi2GetTargetTest.H
@@ -22,99 +22,160 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#include <fapi2.H>
-
+#include <fapi2/target.H>
+#include <error_scope.H>
 
 using namespace fapi2;
 
-
 class Fapi2GetTargetTest : public CxxTest::TestSuite
 {
-public:
-//******************************************************************************
-// test_fapi2GetTarget
-//******************************************************************************
-void test_fapi2GetTarget()
-{
+    public:
+        //******************************************************************************
+        // test_fapi2GetTarget
+        //******************************************************************************
+        void test_fapi2GetTarget()
+        {
 
-    uint8_t    l_chipletNum = 0;
-    uint32_t   l_huid = 0;
+            uint8_t    l_chipletNum = 0;
+            uint32_t   l_huid = 0;
+
+            do
+            {
+                // Get EX target of FAPI_POS (2)
+                Target<fapi2::TARGET_TYPE_EX>  l_tTar;
+                l_tTar = fapi2::getTarget<fapi2::TARGET_TYPE_EX>(2);
+
+                // Verify the chiplet number
+                l_chipletNum = l_tTar.getChipletNumber();
+                FAPI_INF("test_fapi2GetTarget EX Fapi-pos: 2, Chiplet Num: %.8x",
+                        l_chipletNum);
+                if (l_chipletNum != 0x11)
+                {
+                    TS_FAIL("test_fapi2GetTarget: EX Wrong Chiplet Number!");
+                    break;
+                }
+
+                // Verify HUID of EX
+                const TARGETING::Target * l_platTarget =
+                    static_cast<const TARGETING::Target*>(l_tTar.get());
+                l_huid = TARGETING::get_huid(l_platTarget);
+                FAPI_INF("test_fapi2GetTarget EX HUID: %.8x", l_huid);
+                if (l_huid != 0x00061002)
+                {
+                    TS_FAIL("getTarget: EX HUID is Wrong");
+                    break;
+                }
+
+                // get EX's parent and verify HUID of parent
+                TARGETING::Target * l_tempTargetingParent =
+                    static_cast<TARGETING::Target*>(
+                            l_tTar.getParent<TARGET_TYPE_EQ>());
+
+                l_huid = TARGETING::get_huid(l_tempTargetingParent);
+                FAPI_INF("test_fapi2GetTarget EX Parent HUID: %.8x", l_huid);
+
+                if (l_huid != 0x00230001)
+                {
+                    TS_FAIL("test_fapi2GetTarget: EX Wrong Parent HUID!");
+                    break;
+                }
+
+                // get EX's children (cores) and verify their HUIDs
+                uint32_t l_exp_huids[] = {0x00071004, 0x00071005};
+                uint32_t i = 0;
+
+                std::vector<Target<fapi2::TARGET_TYPE_CORE> > l_childCores;
+                l_childCores =
+                    l_tTar.getChildren<fapi2::TARGET_TYPE_CORE>(TARGET_STATE_PRESENT);
+                FAPI_INF("test_fapi2GetTarget EX Number of cores: %.8x",
+                        l_childCores.size());
+                if ((l_childCores.size() < 1 ) ||
+                        (l_childCores.size() > 2 ))
+                {
+                    TS_FAIL("test_fapi2GetTarget: EX Wrong number of children!");
+                    break;
+                }
+                for (std::vector<Target<fapi2::TARGET_TYPE_CORE> >::iterator
+                        l_it = l_childCores.begin();
+                        l_it != l_childCores.end();
+                        ++l_it, ++i)
+                {
+                    l_huid = TARGETING::get_huid(*l_it);
+                    FAPI_INF("test_fapi2GetTarget EX Child HUID: %.8x", l_huid);
+
+                    if (l_huid != l_exp_huids[i])
+                    {
+                        TS_FAIL("test_fapi2GetTarget: EX Wrong Child HUID!");
+                        break;
+                    }
+                }
+                FAPI_INF("test_fapi2GetTarget Test Complete.");
+
+            }while(0);
+        }
 
-    do
-    {
-        // Get EX target of FAPI_POS (2)
-        Target<fapi2::TARGET_TYPE_EX>  l_tTar;
-        l_tTar = fapi2::getTarget<fapi2::TARGET_TYPE_EX>(2);
 
-        // Verify the chiplet number
-        l_chipletNum = l_tTar.getChipletNumber();
-        FAPI_INF("test_fapi2GetTarget EX Fapi-pos: 2, Chiplet Num: %.8x",
-                l_chipletNum);
-        if (l_chipletNum != 0x11)
+        //******************************************************************************
+        // test_fapi2GetTarget_1
+        //******************************************************************************
+        void test_fapi2GetTarget_1()
         {
-            TS_FAIL("test_fapi2GetTarget: EX Wrong Chiplet Number!");
-            break;
-        }
+            // get the 0'th instance of the proc target
+            uint8_t instance = 0;
 
-        // Verify HUID of EX
-        const TARGETING::Target * l_platTarget =
-             static_cast<const TARGETING::Target*>(l_tTar.get());
-                l_huid = TARGETING::get_huid(l_platTarget);
-        FAPI_INF("test_fapi2GetTarget EX HUID: %.8x", l_huid);
-        if (l_huid != 0x00061002)
-        {
-            TS_FAIL("getTarget: EX HUID is Wrong");
-            break;
-        }
+            fapi2::TargetType type = fapi2::TARGET_TYPE_PROC_CHIP;
 
-        // get EX's parent and verify HUID of parent
-        TARGETING::Target * l_tempTargetingParent =
-            static_cast<TARGETING::Target*>(
-                l_tTar.getParent<TARGET_TYPE_EQ>());
+            fapi2::Target<TARGET_TYPE_ALL>* l_target =
+                fapi2::getTarget<fapi2::TARGET_TYPE_ALL>(type,instance);
 
-        l_huid = TARGETING::get_huid(l_tempTargetingParent);
-        FAPI_INF("test_fapi2GetTarget EX Parent HUID: %.8x", l_huid);
+            TARGETING::Target * l_targTarg = l_target->get();
 
-        if (l_huid != 0x00230001)
-        {
-            TS_FAIL("test_fapi2GetTarget: EX Wrong Parent HUID!");
-            break;
-        }
+            // verify the instance number
+            // verify the type
 
-        // get EX's children (cores) and verify their HUIDs
-        uint32_t l_exp_huids[] = {0x00071004, 0x00071005};
-        uint32_t i = 0;
-
-        std::vector<Target<fapi2::TARGET_TYPE_CORE> > l_childCores;
-        l_childCores =
-        l_tTar.getChildren<fapi2::TARGET_TYPE_CORE>(TARGET_STATE_PRESENT);
-        FAPI_INF("test_fapi2GetTarget EX Number of cores: %.8x",
-            l_childCores.size());
-        if ((l_childCores.size() < 1 ) ||
-            (l_childCores.size() > 2 ))
-        {
-            TS_FAIL("test_fapi2GetTarget: EX Wrong number of children!");
-            break;
-        }
-        for (std::vector<Target<fapi2::TARGET_TYPE_CORE> >::iterator
-                l_it = l_childCores.begin();
-                l_it != l_childCores.end();
-                ++l_it, ++i)
-        {
-           l_huid = TARGETING::get_huid(*l_it);
-           FAPI_INF("test_fapi2GetTarget EX Child HUID: %.8x", l_huid);
-
-           if (l_huid != l_exp_huids[i])
-           {
-               TS_FAIL("test_fapi2GetTarget: EX Wrong Child HUID!");
-               break;
-           }
-        }
-        FAPI_INF("test_fapi2GetTarget Test Complete.");
+            TARGETING::ATTR_FAPI_POS_type pos =
+                l_targTarg->getAttr<TARGETING::ATTR_FAPI_POS>();
 
-    }while(0);
-}
+            if( pos != instance )
+            {
+                TS_FAIL("position of proc did not match [%d!=%d]",
+                        instance, pos);
+            }
 
+            TARGETING::ATTR_TYPE_type Ttype =
+                l_targTarg->getAttr<TARGETING::ATTR_TYPE>();
 
-};
+            if( Ttype != TARGETING::TYPE_PROC )
+            {
+                TS_FAIL("Target type was not TYPE_PROC - we got 0x%x", Ttype);
+            }
+
+            //get the 3rd EX chiplet
+            instance = 3;
+
+            type = fapi2::TARGET_TYPE_EX;
+
+            l_target = fapi2::getTarget<fapi2::TARGET_TYPE_ALL>(type,instance);
+
+            l_targTarg = l_target->get();
 
+            // verify the instance number
+            // verify the type
+
+            pos = l_targTarg->getAttr<TARGETING::ATTR_FAPI_POS>();
+
+            if( pos != instance )
+            {
+                TS_FAIL("position of EX chiplet did not match [%d!=%d]",
+                        instance, pos);
+            }
+
+            Ttype = l_targTarg->getAttr<TARGETING::ATTR_TYPE>();
+
+            if( Ttype != TARGETING::TYPE_EX )
+            {
+                TS_FAIL("Target type was not TYPE_EX - we got 0x%x", Ttype);
+            }
+
+        }
+};