PRD: split FSP only PlatServices functions

Change-Id: Id3c081aec51f92bd45b29f62cdadf28b0f668ce5
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14463
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14576

4 files changed, 23 insertions, 90 deletions

diff --git a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C
index 66aeea658..83c3d014f 100755
--- a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C
@@ -80,25 +80,6 @@ int32_t PllDomain::Initialize(void)
 {
 
   int32_t rc = SUCCESS;
-  if(PlatServices::isMasterFSP())
-  {
-//@jl01 D-START
-//Deleting the call of the ClearPll error.
-//These errors used to have to be cleared before you tried to use the chips.
-//However, the inits from other comps are better are cleaning up the PLL errors.
-//    for (unsigned int i = 0; i < GetSize() && rc == SUCCESS; ++i)
-//    {
-//      ExtensibleChip * l_chip = LookUp(i);
-//      ExtensibleFunction * l_clearPll = l_chip->getExtensibleFunction("ClearPll");
-      // Call ClearPll on this chip  (see prdfPluginDef.H for bindParm defn)
-//      (*l_clearPll)(l_chip,PluginDef::bindParm<void *>(NULL));
-//@jl01 D-END
-
-// Don't unmask   04/20/2006 Review
-//      ExtensibleFunction * l_unmask = l_chip->getExtensibleFunction("UnmaskPll");
-//      (*l_unmask)(l_chip,PluginDef::bindParm<void *>(NULL));
-//    }
-  }
   return(rc);
 }
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
index 7494c300b..88661f619 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
@@ -73,43 +73,12 @@ namespace PlatServices
 //##############################################################################
 
 /**
- * @brief   Returns if role is mater fsp.
- * @param   None.
- * @return  TRUE if master fsp. FALSE if not master fsp.
- * @pre     None.
- * @post    None.
- */
-bool isMasterFSP();
-
-/**
- * @brief   Checks if we are currently doing a memory preserving IPL.
- * @return  TRUE if this is a memory preserving IPL, FALSE otherwise.
- */
-bool isMemoryPreservingIpl();
-
-/**
- * @brief   Return ECID string for a given target
- * @param   i_target  Any target
- * @param   o_ecidStr buffer for ECID string
- * @return  Returns ECID string for given target
- */
-void getECIDString( TARGETING::TargetHandle_t i_target,
-                    char * o_ecidStr );
-
-/**
  * @brief Get a PRD timer value based on the current time.
  * @param o_timer The returned Timer
  */
 void getCurrentTime( Timer & o_timer );
 
 /**
- * @brief  Sync the file with RMGR
- * @param  i_fileName File name
- * @return Non-SUCCESS if sync is unsuccessful, SUCCESS otherwise.
- */
-int32_t syncFile( const char * i_fileName );
-
-/**
  * @brief Sleep for given time (seconds plus milliseconds).
  * @param i_seconds      Sleep time in seconds.
  * @param i_milliseconds Sleep time in milliseconds.
@@ -371,16 +340,6 @@ int32_t getDimmSpareConfig( TARGETING::TargetHandle_t i_mba, CenRank i_rank,
 int32_t getMemBufRawCardType( TARGETING::TargetHandle_t i_mbaTarget,
                               CEN_SYMBOL::WiringType & o_wiringType );
 
-/**
- * @brief   Returns the type of the card the DIMM is plugged into.
- * @param   i_dimmTarget A DIMM target.
- * @return
- */
-
-/* TODO - See .C
-getDimmPlugCardType( TARGETING::TargetHandle_t i_dimmTarget );
-*/
-
 //##############################################################################
 //##                    Maintance Command class wrapper
 //##############################################################################
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 8e8b80b22..ecd325a5d 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -62,28 +62,6 @@ namespace PlatServices
 //##                      System Level Utility functions
 //##############################################################################
 
-bool isMemoryPreservingIpl()
-{
-    using namespace TARGETING;
-
-    bool l_isMemPreservingIpl = false;
-    TargetHandle_t l_pTarget = getSystemTarget();
-
-    if(l_pTarget && l_pTarget->getAttr<ATTR_IS_MPIPL_HB>())
-    {
-        l_isMemPreservingIpl = true;
-    }
-
-    return l_isMemPreservingIpl;
-}
-
-bool isSapphireRunning( )
-{
-    return false;
-}
-
-//------------------------------------------------------------------------------
-
 void getCurrentTime( Timer & o_timer )
 {
     timespec_t curTime;
@@ -259,10 +237,6 @@ TARGETING::TargetHandle_t getMasterCore( TARGETING::TargetHandle_t i_procTgt )
     #undef PRDF_FUNC
 }
 
-//------------------------------------------------------------------------------
-
-bool isSmpCoherent() { return false; }
-
 //##############################################################################
 //##                        util functions
 //##############################################################################
@@ -326,6 +300,7 @@ int32_t getCfam( ExtensibleChip * i_chip,
     #undef PRDF_FUNC
 }
 
+//------------------------------------------------------------------------------
 
 TARGETING::TargetHandle_t getActiveRefClk(TARGETING::TargetHandle_t
                             i_procTarget,
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.H b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
index 5fb51aa0c..c366bd69b 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.H
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -55,9 +57,25 @@ namespace PlatServices
 // Inline function definitions for Hostboot compiler optimization. See
 // prdfPlatServices_common.H for the function declarations.
 
-inline bool isMasterFSP() { return true; }
-inline int32_t syncFile( const char * i_fileName ) { return SUCCESS; }
-inline bool atRuntime() { return false; }
+inline bool atRuntime()
+{
+    #ifdef __HOSTBOOT_RUNTIME
+    return true;
+    #else
+    return false;
+    #endif
+}
+
+inline bool isSapphireRunning()
+{
+    #ifdef __HOSTBOOT_RUNTIME
+    return true;
+    #else
+    return false;
+    #endif
+}
+
+inline bool isSmpCoherent() { return false; }
 
 //##############################################################################
 //##                       Processor specific functions