PRD: split Hostboot IPL code in prdfMain

Change-Id: Ia18bb1d7d332cfad13a3cab143b7f92d4fc22173
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14474
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-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14574

3 files changed, 87 insertions, 42 deletions

diff --git a/src/include/usr/diag/prdf/common/prdfMain_common.H b/src/include/usr/diag/prdf/common/prdfMain_common.H
index b9c4ecbf2..239705c6a 100755
--- a/src/include/usr/diag/prdf/common/prdfMain_common.H
+++ b/src/include/usr/diag/prdf/common/prdfMain_common.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2002,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,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.       */
@@ -149,13 +151,6 @@ extern errlHndl_t main( ATTENTION_VALUE_TYPE i_attnType,
                         const AttnList & i_attnList );
 
 /**
- *  @brief Clean up pieces of PRD for fresh IPLs.
- *
- *  Cleans up the PRD persistent storage areas in P1.
- */
-extern void iplCleanup();
-
-/**
  *  @brief Remove non-functional chips from PRD config model
  *
  *  @return Error log if error occurs
diff --git a/src/include/usr/diag/prdf/prdfMain.H b/src/include/usr/diag/prdf/prdfMain.H
index cf02a8981..3458a3278 100644
--- a/src/include/usr/diag/prdf/prdfMain.H
+++ b/src/include/usr/diag/prdf/prdfMain.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.       */
@@ -26,7 +28,7 @@
 
 /**
  * @file  prdfMain.H
- * @brief PRD code used by external components.
+ * @brief PRD code used by external components (IPL and runtime).
  *
  * This file contains code that is strictly specific to Hostboot. All code that
  * is common between FSP and Hostboot should be in the respective common file.
@@ -34,43 +36,19 @@
 
 #include <errl/errlmanager.H> // for errlHndl_t
 
-// This must be included after all other includes. This will take care of cases
-// where a file must be included in the common code, but the include paths are
-// different between FSP and Hostboot.
+// This must be included after all Hostboot specific includes. This will take
+// care of cases where a file must be included in the common code, but the
+// include paths are different between FSP and Hostboot.
 #include <diag/prdf/common/prdfMain_common.H>
 
+// Must be included after including the common code.
+#ifndef __HOSTBOOT_RUNTIME
+  #include <diag/prdf/prdfMain_ipl.H>
+#endif
+
 namespace PRDF
 {
 
-/**
- * @brief  Restores hardware DRAM repairs to reflect what is stored in VPD.
- * @param  i_mba An MBA target.
- * @return Non-SUCCESS if conditions are such that a callout had to be made,
- *         SUCCESS otherwise.
- */
-extern int32_t restoreDramRepairs( const TARGETING::TargetHandle_t i_mba );
-
-/**
- * @brief  Analyzes IPL CE statistics during MNFG IPL
- * @param  i_mba An MBA target.
- * @param  o_calloutMade True if callout has been made, false otherwise .
- * @return Non-SUCCESS if internal function fails, SUCCESS otherwise.
- */
-extern int32_t analyzeIplCEStats( const TARGETING::TargetHandle_t i_mba,
-                                  bool &o_calloutMade );
-
-/**
- * @brief  Starts memory background scrubbing on all MBAs in the node.
- *
- * This will only start the initial fast scrub of all memory. PRD on the FSP or
- * HostServices (SP-less machines) will need to resume normal background
- * scrubbing once this initial fast scrub is complete.
- *
- * @return If an error log is returned, then some internal function failed. See
- *         the FFDC in the error log for failure details.
- */
-extern errlHndl_t startScrub();
-
 } // end namespace PRDF
 
 #endif // __prdfMain_H
diff --git a/src/include/usr/diag/prdf/prdfMain_ipl.H b/src/include/usr/diag/prdf/prdfMain_ipl.H
new file mode 100644
index 000000000..3d51b5209
--- /dev/null
+++ b/src/include/usr/diag/prdf/prdfMain_ipl.H
@@ -0,0 +1,72 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/diag/prdf/prdfMain_ipl.H $                    */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 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.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __prdfMain_ipl_H
+#define __prdfMain_ipl_H
+
+/**
+ * @file  prdfMain_ipl.H
+ * @brief PRD code used by external components (IPL only).
+ *
+ * This file contains code that is strictly specific to Hostboot. All code that
+ * is common between FSP and Hostboot should be in the respective common file.
+ */
+
+namespace PRDF
+{
+
+/**
+ * @brief  Restores hardware DRAM repairs to reflect what is stored in VPD.
+ * @param  i_mba An MBA target.
+ * @return Non-SUCCESS if conditions are such that a callout had to be made,
+ *         SUCCESS otherwise.
+ */
+extern int32_t restoreDramRepairs( const TARGETING::TargetHandle_t i_mba );
+
+/**
+ * @brief  Analyzes IPL CE statistics during MNFG IPL
+ * @param  i_mba An MBA target.
+ * @param  o_calloutMade True if callout has been made, false otherwise .
+ * @return Non-SUCCESS if internal function fails, SUCCESS otherwise.
+ */
+extern int32_t analyzeIplCEStats( const TARGETING::TargetHandle_t i_mba,
+                                  bool &o_calloutMade );
+
+/**
+ * @brief  Starts memory background scrubbing on all MBAs in the node.
+ *
+ * This will only start the initial fast scrub of all memory. PRD on the FSP or
+ * HostServices (SP-less machines) will need to resume normal background
+ * scrubbing once this initial fast scrub is complete.
+ *
+ * @return If an error log is returned, then some internal function failed. See
+ *         the FFDC in the error log for failure details.
+ */
+extern errlHndl_t startScrub();
+
+} // end namespace PRDF
+
+#endif // __prdfMain_ipl_H
+