Move targ info getter func for sbechipOp into common code

Before we only needed to get the target info for the scan chipop,
now more sbe chip ops require this functionality so we are moving
it to common code

Change-Id: Ifbb680db27c5975ee216d5d21ff78192c9ea2d34
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46345
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

2 files changed, 1 insertions, 106 deletions

diff --git a/src/usr/scan/scandd.C b/src/usr/scan/scandd.C
index ffc1fabf1..21f34939a 100644
--- a/src/usr/scan/scandd.C
+++ b/src/usr/scan/scandd.C
@@ -165,101 +165,6 @@ DEVICE_REGISTER_ROUTE( DeviceFW::WILDCARD,
                        TARGETING::TYPE_MCS,
                        scanPerformOp );
 
-
-/// @brief translates HB target types to SBE target type groups
-/// @param[in] i_hbTarget includes the HB target type
-/// @return SBEIO::SBE_TARGET_TYPES returns SBE_TARGET_TYPE_UNKNOWN in error
-SbePsu::SBE_TARGET_TYPES translateToSBETargetType(TARGETING::Target *i_hbTarget)
-{
-
-    TRACDCOMP( g_trac_scandd,
-            ENTER_MRK "entering translateToSBETargetType()");
-    SbePsu::SBE_TARGET_TYPES sbeType;
-    sbeType =  SbePsu::SBE_TARGET_TYPE_UNKNOWN;
-
-
-    switch( i_hbTarget->getAttr<TARGETING::ATTR_TYPE>()){
-
-        case(TARGETING::TYPE_PROC):
-        {
-            sbeType = SbePsu::SBE_TARGET_TYPE_PROC;
-            break;
-        }
-
-        case(TARGETING::TYPE_EX):
-        {
-            sbeType = SbePsu::SBE_TARGET_TYPE_EX;
-            break;
-        }
-
-        case(TARGETING::TYPE_PERV):
-        case(TARGETING::TYPE_XBUS):
-        case(TARGETING::TYPE_MCBIST):
-        case(TARGETING::TYPE_OBUS):
-        case(TARGETING::TYPE_PCI):
-        case(TARGETING::TYPE_L2):
-        case(TARGETING::TYPE_L3):
-        case(TARGETING::TYPE_L4):
-        case(TARGETING::TYPE_CORE):
-        {
-            sbeType = SbePsu::SBE_TARGET_TYPE_PERV;
-            break;
-        }
-        case(TARGETING::TYPE_MCS):
-        {
-            sbeType = SbePsu::SBE_TARGET_TYPE_MCS;
-            break;
-        }
-        default:
-            TRACFCOMP( g_trac_scandd,
-                    ERR_MRK "translateToSBETargetType:>"
-                            " Not supported Target type =%.8X ",
-                    i_hbTarget->getAttr<TARGETING::ATTR_TYPE>() );
-            break;
-    }
-
-    TRACDCOMP( g_trac_scandd, EXIT_MRK "exiting translateToSBETargetType()");
-    return sbeType;
-}
-
-/// @brief returns a ChipletID for a give target
-/// @param[in] i_hbTarget includes the HB target type
-/// @return: ChipletID for i_hbTarget target
-uint8_t getChipletIDForSBE(TARGETING::Target * i_hbTarget)
-{
-    uint8_t l_chipletID = 0;
-
-    TRACDCOMP( g_trac_scandd, ENTER_MRK "entering getChipletIDForSBE()");
-
-    //based on the Host to SBE Interface specification ver 0.70+
-    switch( i_hbTarget->getAttr<TARGETING::ATTR_TYPE>())
-    {
-        case(TARGETING::TYPE_PROC):
-        {   //not all targets will have CHIPLET_IDs
-            l_chipletID = 0;
-            break;
-        }
-        //MCS has a virtual Chiplet ID
-        case (TARGETING::TYPE_MCS):
-        {
-            l_chipletID = VIRTUAL_CHIPLET_ID_BASE_MCS_TARGET_TYPE
-                    + static_cast<uint8_t>(i_hbTarget->
-                    getAttr<TARGETING::ATTR_CHIP_UNIT>());
-            break;
-        }
-        default:
-        {
-            l_chipletID = static_cast<uint8_t>(i_hbTarget->
-                    getAttr<TARGETING::ATTR_CHIPLET_ID>());
-            break;
-        }
-    }
-
-    TRACDCOMP( g_trac_scandd, EXIT_MRK "exiting getChipletIDForSBE()");
-    return l_chipletID;
-}
-
-
 /// @brief Sends Put Ring from Image message to SBE via PSU
 errlHndl_t sbeScanPerformOp( TARGETING::Target * i_target,
                              RingId_t i_ringID,
diff --git a/src/usr/scan/scandd.H b/src/usr/scan/scandd.H
index d20c5a12a..f00f55c72 100644
--- a/src/usr/scan/scandd.H
+++ b/src/usr/scan/scandd.H
@@ -37,6 +37,7 @@
 // ----------------------------------------------
 #include <errl/errlentry.H>
 #include <sbeio/sbe_psudd.H>
+#include <sbeio/sbe_utils.H>
 #include <p9_ring_id.h>
 #include <hw_access_def.H>
 
@@ -89,17 +90,6 @@ errlHndl_t scanDoPibScan( DeviceFW::OperationType i_opType,
                           uint64_t i_ringlength,
                           uint64_t i_flags );
 
-/// @brief translates HB target types to SBE target type groups
-/// @param[in] i_hbTarget includes the HB target type
-/// @return SBEIO::SBE_TARGET_TYPES returns SBE_TARGET_TYPE_UNKNOWN in error
-SBEIO::SbePsu::SBE_TARGET_TYPES
-    translateToSBETargetType(TARGETING::Target * i_hbTarget);
-
-/// @brief returns a ChipletID for a give target
-/// @param[in] i_hbTarget includes the HB target type
-/// @return: ChipletID for i_hbTarget target
-uint8_t getChipletIDForSBE(TARGETING::Target * i_hbTarget);
-
 
 }; // end SCAN namespace