summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/p9/prdfCenPll.C (renamed from src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C)29
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C10
-rw-r--r--src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk1
3 files changed, 20 insertions, 20 deletions
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C b/src/usr/diag/prdf/common/plat/p9/prdfCenPll.C
index 6d2917a15..af550a457 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfCenPll.C
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C $ */
+/* $Source: src/usr/diag/prdf/common/plat/p9/prdfCenPll.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -38,7 +38,7 @@ namespace PRDF
using namespace PLL;
using namespace PlatServices;
-namespace Membuf
+namespace cen_centaur
{
enum
@@ -57,13 +57,14 @@ enum
int32_t QueryPll( ExtensibleChip * i_chip,
bool & o_result)
{
- #define PRDF_FUNC "[Membuf::QueryPll] "
+ #define PRDF_FUNC "[cen_centaur::QueryPll] "
int32_t rc = SUCCESS;
o_result = false;
SCAN_COMM_REGISTER_CLASS * TP_LFIR = i_chip->getRegister("TP_LFIR");
- SCAN_COMM_REGISTER_CLASS * TP_LFIRmask = i_chip->getRegister("TP_LFIR_MASK");
+ SCAN_COMM_REGISTER_CLASS * TP_LFIRmask =
+ i_chip->getRegister("TP_LFIR_MASK");
do
{
@@ -97,7 +98,7 @@ int32_t QueryPll( ExtensibleChip * i_chip,
#undef PRDF_FUNC
}
-PRDF_PLUGIN_DEFINE( Membuf, QueryPll );
+PRDF_PLUGIN_DEFINE( cen_centaur, QueryPll );
/**
* @brief Clear the PLL error for Centaur Plugin
@@ -109,7 +110,7 @@ PRDF_PLUGIN_DEFINE( Membuf, QueryPll );
int32_t ClearPll( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc)
{
- #define PRDF_FUNC "[Membuf::ClearPll] "
+ #define PRDF_FUNC "[cen_centaur::ClearPll] "
int32_t rc = SUCCESS;
if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
@@ -130,7 +131,7 @@ int32_t ClearPll( ExtensibleChip * i_chip,
#undef PRDF_FUNC
}
-PRDF_PLUGIN_DEFINE( Membuf, ClearPll );
+PRDF_PLUGIN_DEFINE( cen_centaur, ClearPll );
/**
* @brief Mask the PLL error for Centaur Plugin
@@ -141,7 +142,7 @@ PRDF_PLUGIN_DEFINE( Membuf, ClearPll );
*/
int32_t MaskPll( ExtensibleChip * i_chip,void * unused)
{
- #define PRDF_FUNC "[Membuf::MaskPll] "
+ #define PRDF_FUNC "[cen_centaur::MaskPll] "
int32_t rc = SUCCESS;
SCAN_COMM_REGISTER_CLASS * TP_LFIR_maskOr =
@@ -163,18 +164,18 @@ int32_t MaskPll( ExtensibleChip * i_chip,void * unused)
#undef PRDF_FUNC
}
-PRDF_PLUGIN_DEFINE( Membuf, MaskPll );
+PRDF_PLUGIN_DEFINE( cen_centaur, MaskPll );
/**
* @brief capture additional PLL FFDC
- * @param i_chip Membuf chip
+ * @param i_chip Centaur chip
* @param i_sc service data collector
* @returns Success
*/
int32_t capturePllFfdc( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & io_sc )
{
- #define PRDF_FUNC "[Membuf::capturePllFfdc] "
+ #define PRDF_FUNC "[cen_centaur::capturePllFfdc] "
// Add FSI status reg
captureFsiStatusReg( i_chip, io_sc );
@@ -183,9 +184,9 @@ int32_t capturePllFfdc( ExtensibleChip * i_chip,
#undef PRDF_FUNC
}
-PRDF_PLUGIN_DEFINE( Membuf, capturePllFfdc );
+PRDF_PLUGIN_DEFINE( cen_centaur, capturePllFfdc );
-} // end namespace Membuf
+} // end namespace cen_centaur
} // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
index 8574c0082..e0003eb7d 100755
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016,2017 */
+/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -346,11 +346,9 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type,
break;
case TYPE_MEMBUF:
-// TODO: RTC 155673 - Add MemBuf chips to PLL domain after Cen PLL plugins
-// have been defined
-// addChipToPllDomain( CLOCK_DOMAIN_MEMBUF, pllDmnMap,
-// chip, trgt, TYPE_MEMBUF,
-// scanFac, resFac );
+ addChipToPllDomain( CLOCK_DOMAIN_MEMBUF, pllDmnMap,
+ chip, trgt, TYPE_MEMBUF,
+ scanFac, resFac );
break;
default: ;
diff --git a/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk b/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk
index ed808bf82..e4d67b930 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk
+++ b/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk
@@ -47,6 +47,7 @@ prd_obj += prdfLineDelete.o
# rule plugin related
prd_rule_plugin += prdfP9Proc.o
prd_rule_plugin += prdfP9Pll.o
+prd_rule_plugin += prdfCenPll.o
prd_rule_plugin += prdfCommonPlugins.o
prd_rule_plugin += prdfLaneRepair.o
prd_rule_plugin += prdfP9Ex.o
OpenPOWER on IntegriCloud