PRD: added getTrgtType iipchip.h

Change-Id: I899d7aa1b4f5f0118eb7898f2d7caf568ddb58a5
RTC: 157783
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27144
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27276
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 38 insertions, 19 deletions

diff --git a/src/usr/diag/prdf/common/framework/config/iipchip.h b/src/usr/diag/prdf/common/framework/config/iipchip.h
index d521648a2..23e1632c1 100755
--- a/src/usr/diag/prdf/common/framework/config/iipchip.h
+++ b/src/usr/diag/prdf/common/framework/config/iipchip.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -46,6 +46,7 @@
 #endif
 
 #include <iipconst.h>
+#include <prdfPlatServices.H>
 
 /*--------------------------------------------------------------------*/
 /*  Forward References                                                */
@@ -119,6 +120,7 @@ class CHIP_CLASS
      <br><b>Notes:       </b> Not to be used previous to Regatta
      </ul><br>
      */
+    // NOTE: Deprecating this interface. Use getTrgt() instead.
     TARGETING::TargetHandle_t GetChipHandle() const
     {
         return iv_pchipHandle;
@@ -186,8 +188,27 @@ class CHIP_CLASS
      <br><b>Notes:       </b> default is to do nothing
      </ul><br>
      */
+    // NOTE: Deprecating this interface. Use getHuid() instead.
     HUID GetId() const;
 
+    /** @return The target associated with this chip. */
+    TARGETING::TargetHandle_t getTrgt() const
+    {
+        return iv_pchipHandle;
+    }
+
+    /** @return The HUID associated with this chip. */
+    TARGETING::ATTR_HUID_type getHuid() const
+    {
+        return PlatServices::getHuid( iv_pchipHandle );
+    }
+
+    /** @return The targeting type associated with this chip. */
+    TARGETING::TYPE getTrgtType() const
+    {
+        return PlatServices::getTargetType( iv_pchipHandle );
+    }
+
   protected:
 
     /**
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfFsiCapUtil.C b/src/usr/diag/prdf/common/plat/p9/prdfFsiCapUtil.C
index 88c37fcdc..8a72bc213 100755
--- a/src/usr/diag/prdf/common/plat/p9/prdfFsiCapUtil.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfFsiCapUtil.C
@@ -58,13 +58,13 @@ void captureFsiStatusReg( ExtensibleChip * i_chip,
         BIT_STRING_ADDRESS_CLASS bs (0, 32, (CPU_WORD *) &u32Data);
 
         io_sc.service_data->GetCaptureData().Add(
-                            i_chip->GetChipHandle(),
+                            i_chip->getTrgt(),
                             ( Util::hashString("CFAM_FSI_STATUS") ^
                               i_chip->getSignatureOffset() ),
                             bs);
     }
 
-    if( TYPE_PROC == getTargetType(i_chip->GetChipHandle()) )
+    if( TYPE_PROC == i_chip->getTrgtType() )
     {
         uint32_t fsiGp7 = 0;
         rc = getCfam( i_chip, 0x2816, fsiGp7 );
@@ -73,7 +73,7 @@ void captureFsiStatusReg( ExtensibleChip * i_chip,
             BIT_STRING_ADDRESS_CLASS bs (0, 32, (CPU_WORD *) &fsiGp7);
 
             io_sc.service_data->GetCaptureData().Add(
-                                i_chip->GetChipHandle(),
+                                i_chip->getTrgt(),
                                 ( Util::hashString("CFAM_FSI_GP7") ^
                                   i_chip->getSignatureOffset() ),
                                 bs);
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
index ae37d0dff..27964b4c6 100755
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
@@ -83,7 +83,7 @@ int32_t QueryPll( ExtensibleChip * i_chip,
         if (rc != SUCCESS)
         {
             PRDF_ERR(PRDF_FUNC "TP_LFIR read failed"
-                     "for 0x%08x", i_chip->GetId());
+                     "for 0x%08x", i_chip->getHuid());
             break;
         }
 
@@ -91,7 +91,7 @@ int32_t QueryPll( ExtensibleChip * i_chip,
         if (rc != SUCCESS)
         {
             PRDF_ERR(PRDF_FUNC "TP_LFIR_MASK read failed"
-                     "for 0x%08x", i_chip->GetId());
+                     "for 0x%08x", i_chip->getHuid());
             break;
         }
 
@@ -106,7 +106,7 @@ int32_t QueryPll( ExtensibleChip * i_chip,
     if( rc != SUCCESS )
     {
         PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X",
-                 i_chip->GetId());
+                 i_chip->getHuid());
     }
 
     return rc;
@@ -139,7 +139,7 @@ int32_t ClearPll( ExtensibleChip * i_chip,
         if (rc != SUCCESS)
         {
             PRDF_ERR(PRDF_FUNC "TP_LFIR_AND write failed"
-                     "for chip: 0x%08x", i_chip->GetId());
+                     "for chip: 0x%08x", i_chip->getHuid());
         }
     }
 
@@ -168,7 +168,7 @@ int32_t MaskPll( ExtensibleChip * i_chip,
     if (rc != SUCCESS)
     {
         PRDF_ERR("[Proc::MaskPll] TP_LFIR_AND write failed"
-                 "for chip: 0x%08x", i_chip->GetId());
+                 "for chip: 0x%08x", i_chip->getHuid());
     }
 
     return rc;
@@ -190,8 +190,7 @@ int32_t capturePllFfdc( ExtensibleChip * i_chip,
     PLL::captureFsiStatusReg( i_chip, io_sc );
 
     // Add EX scom data
-    TargetHandleList exList = getConnected(
-                        i_chip->GetChipHandle(), TYPE_CORE);
+    TargetHandleList exList = getConnected(i_chip->getTrgt(), TYPE_CORE);
     ExtensibleChip * exChip;
     TargetHandleList::iterator itr = exList.begin();
     for( ; itr != exList.end(); ++itr)
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C b/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
index a1b7b2526..58599f483 100755
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
@@ -74,7 +74,7 @@ bool PllDomain::Query(ATTENTION_TYPE attentionType)
             ++index)
         {
             ExtensibleChip * l_chip = LookUp( index );
-            TARGETING::TargetHandle_t l_chipTgt = l_chip->GetChipHandle();
+            TARGETING::TargetHandle_t l_chipTgt = l_chip->getTrgt();
             bool l_analysisPending =
                   sysdbug.isActiveAttentionPending( l_chipTgt, RECOVERABLE );
 
@@ -148,7 +148,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
             }
 
         }
-        else if ( !PlatServices::isFunctional(l_chip->GetChipHandle()) )
+        else if ( !PlatServices::isFunctional(l_chip->getTrgt()) )
         {
             // The chip is now non-functional.
             nfchips.push_back( l_chip );
@@ -158,7 +158,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
     // Remove all non-functional chips.
     for ( NonFuncChips::iterator i = nfchips.begin(); i != nfchips.end(); i++ )
     {
-        systemPtr->RemoveStoppedChips( (*i)->GetChipHandle() );
+        systemPtr->RemoveStoppedChips( (*i)->getTrgt() );
     }
 
     // always suspect the clock source
@@ -187,7 +187,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
         if ( tmpCount == serviceData.service_data->getMruListSize() )
         {
             // No additional callouts were made so add this chip to the list.
-            serviceData.service_data->SetCallout( chip()[0]->GetChipHandle());
+            serviceData.service_data->SetCallout( chip()[0]->getTrgt());
         }
     }
 
@@ -204,13 +204,12 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
     }
     // Set Signature
     serviceData.service_data->GetErrorSignature()->
-        setChipId(chip()[0]->GetId());
+        setChipId(chip()[0]->getHuid());
     serviceData.service_data->SetErrorSig( PRDFSIG_PLL_ERROR );
 
 #ifndef __HOSTBOOT_MODULE
     // Set dump flag dg09a
-    serviceData.service_data->SetDump(iv_dumpContent,chip()[0]->
-        GetChipHandle());
+    serviceData.service_data->SetDump(iv_dumpContent,chip()[0]->getTrgt());
 #endif
 
     // Clear PLLs from this domain.
diff --git a/src/usr/diag/prdf/plat/p9/prdfP9Mcbist.C b/src/usr/diag/prdf/plat/p9/prdfP9Mcbist.C
index de8779b7a..eae5a8959 100644
--- a/src/usr/diag/prdf/plat/p9/prdfP9Mcbist.C
+++ b/src/usr/diag/prdf/plat/p9/prdfP9Mcbist.C
@@ -88,7 +88,7 @@ int32_t PostAnalysis( ExtensibleChip * i_mcbChip,
     {
         mcbdb->iv_sendCmdCompleteMsg = false;
 
-        int32_t rc = mdiaSendEventMsg( i_mcbChip->GetChipHandle(),
+        int32_t rc = mdiaSendEventMsg( i_mcbChip->getTrgt(),
                                        MDIA::COMMAND_COMPLETE );
         if ( SUCCESS != rc )
         {