PRD: moved IPL CE handling and RDR to HB IPL only

Change-Id: I64fc84de00847f88196d580d1b1bc566edbc8f5e
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14521
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/14578

5 files changed, 142 insertions, 25 deletions

diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
new file mode 100644
index 000000000..100fe587e
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
@@ -0,0 +1,61 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H $ */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* 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.       */
+/* 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 __prdfCenMbaDataBundle_H
+#define __prdfCenMbaDataBundle_H
+
+/** @file  prdfCenMbaDataBundle.H
+ *  @brief Contains the data bundle for a PRD Centaur MBA object.
+ */
+
+#include <prdfCenMbaDataBundle_common.H>
+
+//------------------------------------------------------------------------------
+
+#if defined(__HOSTBOOT_MODULE) && !defined(__HOSTBOOT_RUNTIME)
+  #include <prdfCenMbaDataBundle_ipl.H>
+#else
+  #include <prdfCenMbaDataBundle_rt.H>
+#endif
+
+//------------------------------------------------------------------------------
+
+namespace PRDF
+{
+
+/**
+ * @brief  Wrapper function for the CenMbaDataBundle.
+ * @param  i_mbaChip The MBA chip.
+ * @return This MBA's data bundle.
+ */
+inline CenMbaDataBundle * getMbaDataBundle( ExtensibleChip * i_mbaChip )
+{
+    return static_cast<CenMbaDataBundle *>(i_mbaChip->getDataBundle());
+}
+
+} // end namespace PRDF
+
+#endif // __prdfCenMbaDataBundle_H
+
diff --git a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
index ac9aa59f6..7776143da 100644
--- a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
+++ b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
@@ -40,6 +40,7 @@ prd_vpath += ${PRD_SRC_PATH}/common/mnfgtools
 prd_vpath += ${PRD_SRC_PATH}/common/plat
 prd_vpath += ${PRD_SRC_PATH}/common/plat/pegasus
 prd_vpath += ${PRD_SRC_PATH}/common/plugins
+prd_vpath += ${PRD_SRC_PATH}/common/runtime
 prd_vpath += ${PRD_SRC_PATH}/common/util
 
 prd_incpath += ${PRD_SRC_PATH}/common
@@ -52,6 +53,7 @@ prd_incpath += ${PRD_SRC_PATH}/common/mnfgtools
 prd_incpath += ${PRD_SRC_PATH}/common/plat
 prd_incpath += ${PRD_SRC_PATH}/common/plat/pegasus
 prd_incpath += ${PRD_SRC_PATH}/common/plugins
+prd_incpath += ${PRD_SRC_PATH}/common/runtime
 prd_incpath += ${PRD_SRC_PATH}/common/util
 
 ################################################################################
diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.H b/src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.H
new file mode 100644
index 000000000..34d52c183
--- /dev/null
+++ b/src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.H
@@ -0,0 +1,66 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.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 __prdfCenMbaDataBundle_rt_H
+#define __prdfCenMbaDataBundle_rt_H
+
+/** @file  prdfCenMbaDataBundle_rt.H
+ *  @brief Contains the data bundle for a PRD Centaur MBA object (runtime only).
+ */
+
+namespace PRDF
+{
+
+/**
+ * @brief The Centaur MBA data bundle.
+ */
+class CenMbaDataBundle : public CenMbaDataBundleCommon
+{
+  public: // functions
+
+    /**
+     * @brief Constructor.
+     * @param i_mbaChip The MBA chip.
+     */
+    explicit CenMbaDataBundle( ExtensibleChip * i_mbaChip ) :
+        CenMbaDataBundleCommon(i_mbaChip)
+    {}
+
+    /**
+     * @brief Destructor.
+     */
+    ~CenMbaDataBundle() {}
+
+  private: // functions
+
+    CenMbaDataBundle( const CenMbaDataBundle & );
+    const CenMbaDataBundle & operator=( const CenMbaDataBundle & );
+
+};
+
+} // end namespace PRDF
+
+#endif // __prdfCenMbaDataBundle_rt_H
+
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle.H b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle_ipl.H
index 9648bb464..40e0388f8 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle.H
+++ b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle_ipl.H
@@ -1,11 +1,13 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle.H $       */
+/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle_ipl.H $   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* 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.       */
@@ -21,20 +23,16 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-#ifndef PRDF_CEN_MBA_DATABUNDLE_H
-#define PRDF_CEN_MBA_DATABUNDLE_H
+#ifndef __prdfCenMbaDataBundle_ipl_H
+#define __prdfCenMbaDataBundle_ipl_H
 
-/** @file  prdfCenMbaDataBundle.H
- *  @brief Contains the data bundle for a PRD Centaur MBA object.
+/** @file  prdfCenMbaDataBundle_ipl.H
+ *  @brief Contains the data bundle for a PRD Centaur MBA object (IPL only).
  */
 
-#include <prdfCenMbaDataBundle_common.H>
-
 #include <diag/mdia/mdia.H>
 #include <prdfCenMbaIplCeStats.H>
 
-//------------------------------------------------------------------------------
-
 namespace PRDF
 {
 
@@ -95,19 +93,7 @@ class CenMbaDataBundle : public CenMbaDataBundleCommon
 
 };
 
-//------------------------------------------------------------------------------
-
-/**
- * @brief  Wrapper function for the CenMbaDataBundle.
- * @param  i_mbaChip The MBA chip.
- * @return This MBA's data bundle.
- */
-inline CenMbaDataBundle * getMbaDataBundle( ExtensibleChip * i_mbaChip )
-{
-    return static_cast<CenMbaDataBundle *>(i_mbaChip->getDataBundle());
-}
-
 } // end namespace PRDF
 
-#endif // PRDF_CEN_MBA_DATABUNDLE_H
+#endif // __prdfCenMbaDataBundle_ipl_H
 
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index 5eeaee42b..9d77f85a4 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -82,9 +82,7 @@ prd_obj += prdfMfgSync.o
 prd_obj += prdfMfgThresholdFile.o
 
 # plat/pegasus/ (non-rule plugin related)
-prd_obj += prdfCenMbaIplCeStats.o
 prd_obj += prdfCenMbaTdCtlr.o
-prd_obj += prdfDramRepairs.o
 prd_obj += prdfPlatCalloutUtil.o
 prd_obj += prdfPllUtils.o
 
@@ -111,6 +109,10 @@ prd_obj += prdfMbaDomain.o
 # framework/service/
 prd_obj += prdfPlatServices_ipl.o
 
+# plat/pegasus/ (non-rule plugin related)
+prd_obj += prdfCenMbaIplCeStats.o
+prd_obj += prdfDramRepairs.o
+
 endif
 
 ################################################################################