PRD: Check IPL state before accessing global unit xstp register

Change-Id: Icd558b528cfae0d54e28f49af04f461d0251bbbb
RTC: 68302
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5352
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Squashed: I4bdfc19e0a387159e98a77591ec968a6cbc1758d
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5593

4 files changed, 33 insertions, 37 deletions

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 19cdc84a6..6d5a763b5 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
@@ -124,13 +124,20 @@ void milliSleep( uint32_t i_seconds, uint32_t i_milliseconds );
  */
 fapi::Target getFapiTarget( TARGETING::TargetHandle_t i_target );
 
+/**
+ * @brief Check SMGR runtime state
+ * @return true if SMGR state is runtime, false in hostboot without checking
+ */
+bool atRuntime();
+
 //##############################################################################
 //##                       Processor specific functions
 //##############################################################################
 
 //##############################################################################
-//##                       Lane Repair functions /*  */
+//##                       Lane Repair functions
 //##############################################################################
+
 /**
  * @brief   Calls HWP to read newly failed bus lanes
  * @param   i_rxBusTgt    Target of the receiving end of the bus
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
index fab238c40..c2ae26936 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -202,19 +202,18 @@ int32_t CheckForRecoveredSev(ExtensibleChip * i_chip,
                              uint32_t & o_sev)
 {
     int32_t o_rc = SUCCESS;
+    bool l_runtime = atRuntime();
 
     SCAN_COMM_REGISTER_CLASS * l_rer = NULL;
     SCAN_COMM_REGISTER_CLASS * l_TPrer = NULL;
 
-    // FIXME 68302 - This needs a better check for FSP environment
-    // we could get a xstp during hostboot at a stage when GLOBALUNITXSTPFIR
-    // can't be accessed
-#ifndef __HOSTBOOT_MODULE
     SCAN_COMM_REGISTER_CLASS * l_unitxstp = NULL;
+    if ( l_runtime )
+    {
+        l_unitxstp = i_chip->getRegister("GLOBALUNITXSTPFIR");
+        o_rc |= l_unitxstp->Read();
+    }
 
-    l_unitxstp = i_chip->getRegister("GLOBALUNITXSTPFIR");
-    o_rc |= l_unitxstp->Read();
-#endif
     l_rer = i_chip->getRegister("GLOBAL_RE_FIR");
     o_rc |= l_rer->Read();
     l_TPrer = i_chip->getRegister("TP_CHIPLET_RE_FIR");
@@ -242,17 +241,13 @@ int32_t CheckForRecoveredSev(ExtensibleChip * i_chip,
         // error from TP (other than MCS chiplets)
         o_sev = 3;
     }
-    // FIXME 68302 - This needs a better check for FSP environment
-    // we could get a xstp during hostboot at a stage when GLOBALUNITXSTPFIR
-    // can't be accessed
-#ifndef __HOSTBOOT_MODULE
-    else if((l_rer->GetBitFieldJustified(16,16) &
+    else if(l_runtime &&
+            (l_rer->GetBitFieldJustified(16,16) &
              l_unitxstp->GetBitFieldJustified(16,16)) == 0 )
     {
         // core recoverable
         o_sev = 2;
     }
-#endif
     else
     {
         // core checkstop
@@ -360,16 +355,18 @@ int32_t CoreConfiguredAndNotHostboot(ExtensibleChip * i_chip,
                                      bool & o_isCoreConfigured)
 {
     o_isCoreConfigured = false;
-#ifdef __HOSTBOOT_MODULE
-    // if in hostboot just return false to prevent the default reg capture
-    return SUCCESS;
-#endif
 
-    TargetHandleList l_coreList =
-      PlatServices::getConnected(i_chip->GetChipHandle(), TYPE_EX);
+    // if at not at runtime just return o_isCoreConfigured = false to prevent
+    // the default reg capture
+    if (atRuntime())
+    {
+        // make sure this chip has config'd cores
+        TargetHandleList l_coreList =
+          PlatServices::getConnected(i_chip->GetChipHandle(), TYPE_EX);
 
-    if (l_coreList.size() > 0)
-        o_isCoreConfigured = true;
+        if (l_coreList.size() > 0)
+            o_isCoreConfigured = true;
+    }
 
     return SUCCESS;
 } PRDF_PLUGIN_DEFINE(Proc, CoreConfiguredAndNotHostboot);
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 81564e53a..48f356528 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -57,14 +57,6 @@ namespace PlatServices
 //##                      System Level Utility functions
 //##############################################################################
 
-bool isMasterFSP()
-{
-    // Always true in Hostboot
-    return true;
-}
-
-//------------------------------------------------------------------------------
-
 bool isMemoryPreservingIpl()
 {
     using namespace TARGETING;
@@ -96,13 +88,6 @@ void getCurrentTime( Timer & o_timer )
 
 //------------------------------------------------------------------------------
 
-int32_t syncFile( const char * i_fileName )
-{
-    return SUCCESS;
-}
-
-//------------------------------------------------------------------------------
-
 void milliSleep( uint32_t i_seconds, uint32_t i_milliseconds )
 {
     nanosleep( i_seconds, i_milliseconds * 1000000 );
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.H b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
index 41e489152..edb86dcbd 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.H
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
@@ -52,6 +52,13 @@ namespace PlatServices
 //##                      System Level Utility functions
 //##############################################################################
 
+// 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; }
+
 //##############################################################################
 //##                       Processor specific functions
 //##############################################################################