fixed compilation errors when ENABLE_CHECKSTOP_ANALYSIS is enabled

Change-Id: Ic77f03ca0b4c221eef37581e6791ab8b4398af74
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41180
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

6 files changed, 15 insertions, 16 deletions

diff --git a/src/usr/diag/HBconfig b/src/usr/diag/HBconfig
index 3bf6f2a98..3c46d6e02 100644
--- a/src/usr/diag/HBconfig
+++ b/src/usr/diag/HBconfig
@@ -4,7 +4,7 @@ config HBRT_PRD
         Enable HBRT PRD.
 
 config ENABLE_CHECKSTOP_ANALYSIS
-    default n
+    default y
     help
         Enable collection of FIR data by OCC for checkstops and
         post-checkstop analysis by PRD on system reboot
diff --git a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
index a7a89b4cf..dfdaabf9c 100755
--- a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
+++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
@@ -33,7 +33,7 @@ using namespace TARGETING;
 namespace PRDF
 {
 
-errlHndl_t FileScomAccessor::Access(
+uint32_t FileScomAccessor::Access(
                             TargetHandle_t i_target,
                             BitString & bs,
                             uint64_t registerId,
@@ -41,7 +41,7 @@ errlHndl_t FileScomAccessor::Access(
 {
     #define PRDF_FUNC "[FileScomAccessor::Access()] "
 
-    errlHndl_t errlH = NULL;
+    uint32_t rc = SUCCESS;
 
     PnorFirDataReader & firData = PnorFirDataReader::getPnorFirDataReader();
     uint64_t data = 0;
@@ -64,7 +64,7 @@ errlHndl_t FileScomAccessor::Access(
             PRDF_ERR(PRDF_FUNC "Wrong Operation:%u", operation);
     }
 
-    return errlH;
+    return rc;
 
     #undef PRDF_FUNC
 }
diff --git a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
index 256d3ac4d..61d255e8a 100755
--- a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
+++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
@@ -65,10 +65,10 @@ class FileScomAccessor : public ScomAccessor
      * @param BitString - holds data read or to write
      * @param register address
      * @param [READ|WRITE]
-     * @returns NULL if success, valid error handle otherwise
+     * @returns SUCCESS or PRD_SCANCOM_FAILURE
      * @pre bs.Length() must be size of register data to read/write
      */
-    virtual errlHndl_t Access(TARGETING::TargetHandle_t i_target,
+    virtual uint32_t Access(TARGETING::TargetHandle_t i_target,
                             BitString & bs,
                             uint64_t registerId,
                             MopRegisterAccess::Operation operation) const;
diff --git a/src/usr/isteps/istep06/host_gard.C b/src/usr/isteps/istep06/host_gard.C
index f8dc30f1b..7bbaa7d64 100644
--- a/src/usr/isteps/istep06/host_gard.C
+++ b/src/usr/isteps/istep06/host_gard.C
@@ -58,9 +58,6 @@
 #endif
 
 #ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
-  #include <hwpf/hwp/occ/occ.H>
-  #include <hwpf/hwp/occ/occ_common.H>
-
   #include <diag/attn/attn.H>
 #endif
 
diff --git a/src/usr/isteps/istep16/call_host_activate_slave_cores.C b/src/usr/isteps/istep16/call_host_activate_slave_cores.C
index 7cb56d536..87e925b53 100644
--- a/src/usr/isteps/istep16/call_host_activate_slave_cores.C
+++ b/src/usr/isteps/istep16/call_host_activate_slave_cores.C
@@ -45,6 +45,10 @@
 #include    <p9_cpu_special_wakeup.H>
 #include    <p9_dump_stop_info.H>
 
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
+  #include <isteps/pm/occCheckstop.H>
+#endif
+
 using   namespace   ERRORLOG;
 using   namespace   TARGETING;
 using   namespace   ISTEP;
@@ -132,7 +136,7 @@ void* call_host_activate_slave_cores (void *io_pArgs)
                 fapi2::toString( l_fapi2ProcTarget,
                                  l_targName,
                                  sizeof(l_targName) );
-    
+
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                     "Call p9_dump_stop_info on processor %s", l_targName );
 
@@ -229,7 +233,7 @@ void* call_host_activate_slave_cores (void *io_pArgs)
     }
     // @@@@@    END CUSTOM BLOCK:   @@@@@
 
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
     if( l_stepError.isNull() )
     {
         // update firdata inputs for OCC
diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C
index 5b0c9372d..8a2346e1e 100644
--- a/src/usr/isteps/pm/pm_common.C
+++ b/src/usr/isteps/pm/pm_common.C
@@ -193,12 +193,10 @@ namespace HBPM
         {
             l_config_data->firMaster = IS_FIR_MASTER;
 
-            // TODO: RTC 124683 The ability to write the HOMER data
-            //        is currently not available at runtime.
-#ifndef __HOSTBOOT_RUNTIME
+            #if !defined(__HOSTBOOT_RUNTIME) || defined(CONFIG_HBRT_PRD)
             l_errl = PRDF::writeHomerFirData( l_config_data->firdataConfig,
-                                          sizeof(config_data->firdataConfig) );
-#endif
+                                         sizeof(l_config_data->firdataConfig) );
+            #endif
 
         }
         else