PRD: Chip support for the Naples processor

Change-Id: I7bda81f516a0df7519bf6d651187d18fe5c2971b
RTC: 119021
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18016
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Brian J. Stegmiller <bjs@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/20082
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW

3 files changed, 26 insertions, 11 deletions

diff --git a/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C b/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C
index f1886e07f..337332c8c 100755
--- a/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C
+++ b/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C
@@ -51,7 +51,8 @@ int32_t FUNC( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & i_sc ) \
     CalloutUtil::defaultError( i_sc ); \
     return SUCCESS; \
 } \
-PRDF_PLUGIN_DEFINE( Proc, FUNC );
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, FUNC ); \
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, FUNC );
 
 PLUGIN_TOD_UNEXPECTED_ATTN( clearServiceCallFlag )
 PLUGIN_TOD_UNEXPECTED_ATTN( todNewTopologyIfBackupMDMT )
@@ -85,7 +86,8 @@ int32_t isTodDisabled( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE( Proc, isTodDisabled );
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, isTodDisabled );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, isTodDisabled );
 
 } //namespace Proc ends
 
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C
index 56f0aa247..9ab033b8a 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C
+++ b/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -61,7 +61,8 @@ int32_t analyzeMpIPL( ExtensibleChip * i_chip,
 
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE( Proc, analyzeMpIPL );
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, analyzeMpIPL );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, analyzeMpIPL );
 
 /**
  * @brief Handle SLW Malfunction alert
@@ -78,7 +79,8 @@ int32_t slwRecovery( ExtensibleChip * i_chip,
     CalloutUtil::defaultError( i_sc );
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE( Proc, slwRecovery );
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, slwRecovery );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, slwRecovery );
 
 /**
  * @brief   Callout Peer PSI connected to given Proc target
@@ -96,7 +98,8 @@ int32_t calloutPeerPsiBusTgt( ExtensibleChip * i_chip,
     CalloutUtil::defaultError( i_sc );
     return SUCCESS;
 }
-PRDF_PLUGIN_DEFINE( Proc, calloutPeerPsiBusTgt );
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, calloutPeerPsiBusTgt );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, calloutPeerPsiBusTgt );
 
 /**
  * @brief Check if we're running in hostboot
@@ -108,7 +111,9 @@ int32_t inHostboot( ExtensibleChip * i_chip,
                     STEP_CODE_DATA_STRUCT & i_sc )
 {
     return SUCCESS;
-} PRDF_PLUGIN_DEFINE( Proc, inHostboot );
+}
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, inHostboot );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, inHostboot );
 
 /**
  * @brief Collect NX debug traces
@@ -124,7 +129,9 @@ int32_t collectNxTraceArray( ExtensibleChip * i_chip,
 
     return SUCCESS;
 
-} PRDF_PLUGIN_DEFINE( Proc, collectNxTraceArray );
+}
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, collectNxTraceArray );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, collectNxTraceArray );
 
 }//namespace Proc ends
 
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C b/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C
index e72642b64..da83a7391 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C
+++ b/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C
@@ -60,7 +60,9 @@ int32_t  queryPciOscErr( ExtensibleChip * i_procChip,
 
     return o_rc;
     #undef PRDF_FUNC
-}PRDF_PLUGIN_DEFINE( Proc, queryPciOscErr );
+}
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, queryPciOscErr );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, queryPciOscErr );
 
 //------------------------------------------------------------------------------
 
@@ -81,7 +83,9 @@ int32_t analyzePciClkFailover( ExtensibleChip * i_procChip,
     return o_rc;
 
     #undef PRDF_FUNC
-}PRDF_PLUGIN_DEFINE( Proc, analyzePciClkFailover );
+}
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, analyzePciClkFailover );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, analyzePciClkFailover );
 
 //------------------------------------------------------------------------------
 
@@ -102,7 +106,9 @@ int32_t clearPciOscFailOver( ExtensibleChip * i_procChip,
     return o_rc;
 
     #undef PRDF_FUNC
-}PRDF_PLUGIN_DEFINE( Proc, clearPciOscFailOver );
+}
+PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, clearPciOscFailOver );
+PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, clearPciOscFailOver );
 
 } // end namespace Proc