242 files changed, 2399 insertions, 889 deletions

diff --git a/src/usr/diag/attn/attnfwd.H b/src/usr/diag/attn/attnfwd.H
index 52422889b..af857ddfb 100644
--- a/src/usr/diag/attn/attnfwd.H
+++ b/src/usr/diag/attn/attnfwd.H
@@ -33,7 +33,7 @@
 #include <attn/attn.H>
 #include <intr/interrupt.H>
 #include <errl/errlentry.H>
-#include <diag/prdf/prdfMain.H>
+#include <diag/prdf/common/prdfMain.H>
 #include <targeting/common/target.H>
 #include <vector>
 #include <builtins.h>
diff --git a/src/usr/diag/prdf/framework/config/iipConfigurator.C b/src/usr/diag/prdf/common/framework/config/iipConfigurator.C
index 63f50da79..2b3bb8ca1 100755
--- a/src/usr/diag/prdf/framework/config/iipConfigurator.C
+++ b/src/usr/diag/prdf/common/framework/config/iipConfigurator.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipConfigurator.C $        */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipConfigurator.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -57,12 +57,12 @@
 //---------------------------------------------------------------------
 // Member Function Specifications
 //---------------------------------------------------------------------
+
+namespace PRDF
+{
+
 Configurator::~Configurator()
 {
 }
-/*---------------------------------------------------------------------------*/
-/*  Change Log                                                               */
-/*---------------------------------------------------------------------------*/
-/* Description / [Reason]                                    Date     USRID  */
-// #undef syntax error, non inlined destructor /d24747.5   03/01/96  dgilbert
-/*                                                                           */
+
+} // End namespace PRDF
diff --git a/src/usr/diag/prdf/framework/config/iipConfigurator.h b/src/usr/diag/prdf/common/framework/config/iipConfigurator.h
index cf231a62e..311a1fc78 100755
--- a/src/usr/diag/prdf/framework/config/iipConfigurator.h
+++ b/src/usr/diag/prdf/common/framework/config/iipConfigurator.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipConfigurator.h $        */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipConfigurator.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -83,6 +83,9 @@ class CHIP_CLASS;
 class Domain;
 class System;
 
+namespace PRDF
+{
+
 class Configurator
 {
 public:
@@ -203,4 +206,6 @@ private:
 
 };
 
+} // End namespace PRDF
+
 #endif
diff --git a/src/usr/diag/prdf/framework/config/iipDomain.C b/src/usr/diag/prdf/common/framework/config/iipDomain.C
index 01cc4d97e..5a86822af 100755
--- a/src/usr/diag/prdf/framework/config/iipDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/iipDomain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipDomain.C $              */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipDomain.C $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipDomain.h b/src/usr/diag/prdf/common/framework/config/iipDomain.h
index bf1d9ed64..4fdab1a57 100755
--- a/src/usr/diag/prdf/framework/config/iipDomain.h
+++ b/src/usr/diag/prdf/common/framework/config/iipDomain.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipDomain.h $              */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipDomain.h $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipDomainContainer.C b/src/usr/diag/prdf/common/framework/config/iipDomainContainer.C
index e952ce00d..2274adce9 100755
--- a/src/usr/diag/prdf/framework/config/iipDomainContainer.C
+++ b/src/usr/diag/prdf/common/framework/config/iipDomainContainer.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipDomainContainer.C $     */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipDomainContainer.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipDomainContainer.h b/src/usr/diag/prdf/common/framework/config/iipDomainContainer.h
index 0b24b2810..223fb8120 100755
--- a/src/usr/diag/prdf/framework/config/iipDomainContainer.h
+++ b/src/usr/diag/prdf/common/framework/config/iipDomainContainer.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipDomainContainer.h $     */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipDomainContainer.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipDomainContainer.inl b/src/usr/diag/prdf/common/framework/config/iipDomainContainer.inl
index 6a57ac26e..effca23b3 100755
--- a/src/usr/diag/prdf/framework/config/iipDomainContainer.inl
+++ b/src/usr/diag/prdf/common/framework/config/iipDomainContainer.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipDomainContainer.inl $   */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipDomainContainer.inl $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipSystem.C b/src/usr/diag/prdf/common/framework/config/iipSystem.C
index 0405347b4..4fda713cf 100755
--- a/src/usr/diag/prdf/framework/config/iipSystem.C
+++ b/src/usr/diag/prdf/common/framework/config/iipSystem.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipSystem.C $              */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipSystem.C $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipSystem.h b/src/usr/diag/prdf/common/framework/config/iipSystem.h
index c4607d750..23f84e4da 100755
--- a/src/usr/diag/prdf/framework/config/iipSystem.h
+++ b/src/usr/diag/prdf/common/framework/config/iipSystem.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipSystem.h $              */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipSystem.h $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipchip.C b/src/usr/diag/prdf/common/framework/config/iipchip.C
index 6d1ff4718..78e1ed378 100755
--- a/src/usr/diag/prdf/framework/config/iipchip.C
+++ b/src/usr/diag/prdf/common/framework/config/iipchip.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipchip.C $                */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipchip.C $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/iipchip.h b/src/usr/diag/prdf/common/framework/config/iipchip.h
index 193ed9a30..e45adb0d5 100755
--- a/src/usr/diag/prdf/framework/config/iipchip.h
+++ b/src/usr/diag/prdf/common/framework/config/iipchip.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/iipchip.h $                */
+/* $Source: src/usr/diag/prdf/common/framework/config/iipchip.h $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfExDomain.H b/src/usr/diag/prdf/common/framework/config/prdfExDomain.H
index f284a1654..0849affb4 100644
--- a/src/usr/diag/prdf/framework/config/prdfExDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfExDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfExDomain.H $           */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfExDomain.H $    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfExtensibleChip.H b/src/usr/diag/prdf/common/framework/config/prdfExtensibleChip.H
index 9bd4989c3..01f17c0eb 100755
--- a/src/usr/diag/prdf/framework/config/prdfExtensibleChip.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfExtensibleChip.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfExtensibleChip.H $     */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfExtensibleChip.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -36,7 +36,7 @@ class PrdfExtensibleChip : public CHIP_CLASS
   public:
     PrdfExtensibleChip( TARGETING::TargetHandle_t i_target ) :
         CHIP_CLASS(i_target)
-    {};
+    {}
 
     virtual PrdfExtensibleChipFunction * getExtensibleFunction(
                                             const char * i_func,
diff --git a/src/usr/diag/prdf/framework/config/prdfExtensibleDomain.C b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C
index a02cfe818..ef6991896 100755
--- a/src/usr/diag/prdf/framework/config/prdfExtensibleDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfExtensibleDomain.C $   */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfExtensibleDomain.H b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.H
index cd8a7f829..b37f60c9e 100755
--- a/src/usr/diag/prdf/framework/config/prdfExtensibleDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfExtensibleDomain.H $   */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfFabricDomain.C b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C
index 1998da4c8..e01d38c02 100755
--- a/src/usr/diag/prdf/framework/config/prdfFabricDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfFabricDomain.C $       */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfFabricDomain.H b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.H
index 2d2af704c..645daac21 100755
--- a/src/usr/diag/prdf/framework/config/prdfFabricDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfFabricDomain.H $       */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfFabricDomain.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfMbaDomain.H b/src/usr/diag/prdf/common/framework/config/prdfMbaDomain.H
index aff411447..3b98351c5 100644
--- a/src/usr/diag/prdf/framework/config/prdfMbaDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfMbaDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfMbaDomain.H $          */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfMbaDomain.H $   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfMcsDomain.H b/src/usr/diag/prdf/common/framework/config/prdfMcsDomain.H
index a5a4ea21d..60cdb5f21 100644
--- a/src/usr/diag/prdf/framework/config/prdfMcsDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfMcsDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfMcsDomain.H $          */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfMcsDomain.H $   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfMembufDomain.H b/src/usr/diag/prdf/common/framework/config/prdfMembufDomain.H
index 9890cc9b9..df4f08970 100644
--- a/src/usr/diag/prdf/framework/config/prdfMembufDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfMembufDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfMembufDomain.H $       */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfMembufDomain.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfParentDomain.C b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C
index 4c265a387..83c46a7ed 100755
--- a/src/usr/diag/prdf/framework/config/prdfParentDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfParentDomain.C $       */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfParentDomain.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfParentDomain.H b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.H
index 7ca9b3ff4..79ef13097 100755
--- a/src/usr/diag/prdf/framework/config/prdfParentDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfParentDomain.H $       */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfParentDomain.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfPllDomain.C b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C
index 464442d7e..3acd6c45c 100755
--- a/src/usr/diag/prdf/framework/config/prdfPllDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfPllDomain.C $          */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfPllDomain.C $   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -188,8 +188,10 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
     serviceData.service_data->GetErrorSignature()->setChipId(chip()[0]->GetId());
     serviceData.service_data->GetErrorSignature()->setRegId(PRDF_PLL_ERROR);
 
+#ifndef __HOSTBOOT_MODULE
     // Set dump flag dg09a
     serviceData.service_data->SetDump(iv_dumpContent,chip()[0]->GetChipHandle());
+#endif
 
     // Clear PLLs from this domain.
     PrdfExtensibleDomainFunction * l_clear = getExtensibleFunction("ClearPll");
@@ -219,13 +221,15 @@ void PllDomain::Order(ATTENTION_TYPE attentionType)
 
 //------------------------------------------------------------------------------
 
-int32_t PllDomain::ClearPll( PllDomain * i_domain,
+int32_t PllDomain::ClearPll( PrdfExtensibleDomain * i_domain,
                              STEP_CODE_DATA_STRUCT i_sc )
 {
+    PllDomain * l_domain = (PllDomain *) i_domain;
+
     // Clear children chips.
-    for ( uint32_t i = 0; i < i_domain->GetSize(); i++ )
+    for ( uint32_t i = 0; i < l_domain->GetSize(); i++ )
     {
-        PrdfExtensibleChip * l_chip = i_domain->LookUp(i);
+        PrdfExtensibleChip * l_chip = l_domain->LookUp(i);
         PrdfExtensibleChipFunction * l_clear =
                                     l_chip->getExtensibleFunction("ClearPll");
         (*l_clear)( l_chip,
@@ -235,7 +239,7 @@ int32_t PllDomain::ClearPll( PllDomain * i_domain,
     // Clear children domains.
     // This looks like a recursive call.  It calls other domains of Clear.
     ParentDomain<PrdfExtensibleDomain>::iterator i;
-    for (i = i_domain->getBeginIterator(); i != i_domain->getEndIterator(); i++)
+    for (i = l_domain->getBeginIterator(); i != l_domain->getEndIterator(); i++)
     {
         // Clear PLLs from this domain.
         PrdfExtensibleDomainFunction * l_clear =
@@ -250,13 +254,15 @@ PRDF_PLUGIN_DEFINE( PllDomain, ClearPll );
 
 //------------------------------------------------------------------------------
 
-int32_t PllDomain::MaskPll( PllDomain * i_domain,
+int32_t PllDomain::MaskPll( PrdfExtensibleDomain * i_domain,
                             STEP_CODE_DATA_STRUCT i_sc )
 {
+    PllDomain * l_domain = (PllDomain *) i_domain;
+
     // Mask children chips.
-    for ( uint32_t i = 0; i < i_domain->GetSize(); i++ )
+    for ( uint32_t i = 0; i < l_domain->GetSize(); i++ )
     {
-        PrdfExtensibleChip * l_chip = i_domain->LookUp(i);
+        PrdfExtensibleChip * l_chip = l_domain->LookUp(i);
         PrdfExtensibleChipFunction * l_mask =
                                     l_chip->getExtensibleFunction("MaskPll");
         (*l_mask)( l_chip,
@@ -266,7 +272,7 @@ int32_t PllDomain::MaskPll( PllDomain * i_domain,
     // Mask children domains.
     // This looks like a recursive call.  It calls other domains of Mask.
     ParentDomain<PrdfExtensibleDomain>::iterator i;
-    for (i = i_domain->getBeginIterator(); i != i_domain->getEndIterator(); i++)
+    for (i = l_domain->getBeginIterator(); i != l_domain->getEndIterator(); i++)
     {
         PrdfExtensibleDomainFunction * l_mask =
                                 (i->second)->getExtensibleFunction("MaskPll");
diff --git a/src/usr/diag/prdf/framework/config/prdfPllDomain.H b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.H
index ee5fa1b05..b5d55a206 100755
--- a/src/usr/diag/prdf/framework/config/prdfPllDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfPllDomain.H $          */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfPllDomain.H $   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -25,17 +25,15 @@
 #define prdfPllDomain_H
 
 #include <iipDomain.h>
-#include <prdfRuleChipDomain.H>
-#include <prdfParentDomain.H>
-
-#ifndef iipResolutionFactory_h
 #include <iipResolutionFactory.h>
-#endif
-
+#include <prdfExtensibleDomain.H>
+#include <prdfParentDomain.H>
+#include <prdfRuleChipDomain.H>
 #include <prdfThresholdResolutions.H>
-#include <hdctContent.H> // for hwTableContent
 
-#include <prdfExtensibleDomain.H>
+#ifndef __HOSTBOOT_MODULE
+  #include <hdctContent.H> // for hwTableContent
+#endif
 
 namespace PRDF
 {
@@ -47,24 +45,18 @@ class PllDomain : public PrdfRuleChipDomain, public PrdfExtensibleDomain,
 {
   public:
 
+#ifdef __HOSTBOOT_MODULE
+
     /** @fn PllDomain
      *  @brief Constructor
      *  @param DOMAIN_ID - the domain ID
      *  @param Resolution to callout the correct clock source
-     *  @param Dump content
+     *  @param ThresholdResolution::ThresholdPolicy
      */
     PllDomain( DOMAIN_ID domain_id, Resolution & clockSource,
-               hwTableContent i_hwdc );
+               const ThresholdResolution::ThresholdPolicy & i_mfgThresh );
 
-    /** @fn PllDomain
-     *  @brief Constructor
-     *  @param DOMAIN_ID - the domain ID
-     *  @param Resolution to callout the correct repower clock logic
-     *  @param Resolution to callout the correct clock source
-     *  @param Dump content
-     */
-    PllDomain( DOMAIN_ID domain_id, Resolution & clockRpwr,
-               Resolution & clockSource, hwTableContent i_hwdc );
+#else // not __HOSTBOOT_MODULE
 
     /** @fn PllDomain
      *  @brief Constructor
@@ -75,19 +67,10 @@ class PllDomain : public PrdfRuleChipDomain, public PrdfExtensibleDomain,
      */
     PllDomain( DOMAIN_ID domain_id, Resolution & clockSource,
                hwTableContent i_hwdc,
-               const ThresholdResolution::ThresholdPolicy& i_mfgThresh);
+               const ThresholdResolution::ThresholdPolicy & i_mfgThresh );
+
+#endif // not __HOSTBOOT_MODULE
 
-    /** @fn PllDomain
-     *  @brief Constructor
-     *  @param DOMAIN_ID - the domain ID
-     *  @param Resolution to callout the correct repower clock logic
-     *  @param Resolution to callout the correct clock source
-     *  @param Dump content
-     *  @param ThresholdResolution::ThresholdPolicy
-     */
-    PllDomain( DOMAIN_ID domain_id, Resolution & clockRpwr,
-               Resolution & clockSource, hwTableContent i_hwdc,
-               const ThresholdResolution::ThresholdPolicy& i_mfgThresh);
   /**
    Perform any initialization required by the hardware
    @returns error code
@@ -113,8 +96,8 @@ class PllDomain : public PrdfRuleChipDomain, public PrdfExtensibleDomain,
    @pre Initialize(); Query() == true
    @post domain element order may be modified.
    */
-  virtual int32_t Analyze(STEP_CODE_DATA_STRUCT & serviceData,
-                         ATTENTION_TYPE attentionType);
+  virtual int32_t Analyze( STEP_CODE_DATA_STRUCT & serviceData,
+                           ATTENTION_TYPE attentionType );
 
     /**
      * @brief  Domain level plugin function used to clear PLL attentions in a
@@ -123,7 +106,7 @@ class PllDomain : public PrdfRuleChipDomain, public PrdfExtensibleDomain,
      * @param  i_sc The step code data struct.
      * @return SUCCESS
      */
-    static int32_t ClearPll( PllDomain * i_domain,
+    static int32_t ClearPll( PrdfExtensibleDomain * i_domain,
                              STEP_CODE_DATA_STRUCT i_sc );
 
     /**
@@ -133,7 +116,7 @@ class PllDomain : public PrdfRuleChipDomain, public PrdfExtensibleDomain,
      * @param  i_sc The step code data struct.
      * @return SUCCESS
      */
-    static int32_t MaskPll( PllDomain * i_domain,
+    static int32_t MaskPll( PrdfExtensibleDomain * i_domain,
                             STEP_CODE_DATA_STRUCT i_sc );
 
 protected:
@@ -149,45 +132,37 @@ protected:
 private:  // functions
 private:  // Data
 
-  enum {CONTAINER_SIZE = 8, PRDF_PLL_ERROR = 0xed};      //dg03
+  enum {CONTAINER_SIZE = 8, PRDF_PLL_ERROR = 0xed};
 
   Resolution & closeClockSource;
   Resolution & farClockSource;
 
-//  int threshold;      dg05d
-  Resolution & iv_threshold;  // dg05a dg06c
-  hwTableContent iv_dumpContent; //dg08a
+  Resolution & iv_threshold;
+
+#ifndef __HOSTBOOT_MODULE
+    hwTableContent iv_dumpContent;
+#endif
 
 };
 
 //------------------------------------------------------------------------------
 
+#ifdef __HOSTBOOT_MODULE
+
 inline
 PllDomain::PllDomain( DOMAIN_ID domain_id, Resolution & clockSource,
-                      hwTableContent i_hwdc ) :
+                      const ThresholdResolution::ThresholdPolicy& i_mfgThresh) :
     PrdfRuleChipDomain( domain_id, PllDomain::CONTAINER_SIZE ),
     PrdfExtensibleDomain("PllDomain"),
     closeClockSource(clockSource),
-    farClockSource(clockSource),   // dg06c
-    iv_threshold( ResolutionFactory::Access().GetThresholdResolution( 1,
-                                ThresholdResolution::cv_pllDefault,
-                                ThresholdResolution::cv_mnfgDefault ) ),
-    iv_dumpContent(i_hwdc)   // dg08a
-{ }
-
-inline
-PllDomain::PllDomain( DOMAIN_ID domain_id, Resolution & clockRpwr,
-                      Resolution & clockSource, hwTableContent i_hwdc ) :
-    PrdfRuleChipDomain( domain_id, PllDomain::CONTAINER_SIZE ),
-    PrdfExtensibleDomain("PllDomain"),
-    closeClockSource(clockRpwr),
     farClockSource(clockSource),
     iv_threshold( ResolutionFactory::Access().GetThresholdResolution( 1,
                                 ThresholdResolution::cv_pllDefault,
-                                ThresholdResolution::cv_mnfgDefault )),
-    iv_dumpContent(i_hwdc)   //dg08a
+                                i_mfgThresh ) )
 {}
 
+#else // not __HOSTBOOT_MODULE
+
 inline
 PllDomain::PllDomain( DOMAIN_ID domain_id, Resolution & clockSource,
                       hwTableContent i_hwdc,
@@ -195,27 +170,15 @@ PllDomain::PllDomain( DOMAIN_ID domain_id, Resolution & clockSource,
     PrdfRuleChipDomain( domain_id, PllDomain::CONTAINER_SIZE ),
     PrdfExtensibleDomain("PllDomain"),
     closeClockSource(clockSource),
-    farClockSource(clockSource),   // dg06c
-    iv_threshold( ResolutionFactory::Access().GetThresholdResolution( 1,
-                                ThresholdResolution::cv_pllDefault,
-                                i_mfgThresh ) ),
-    iv_dumpContent(i_hwdc)   // dg08a
-{ }
-
-inline
-PllDomain::PllDomain( DOMAIN_ID domain_id, Resolution & clockRpwr,
-                      Resolution & clockSource, hwTableContent i_hwdc,
-                      const ThresholdResolution::ThresholdPolicy& i_mfgThresh) :
-    PrdfRuleChipDomain( domain_id, PllDomain::CONTAINER_SIZE ),
-    PrdfExtensibleDomain("PllDomain"),
-    closeClockSource(clockRpwr),
     farClockSource(clockSource),
     iv_threshold( ResolutionFactory::Access().GetThresholdResolution( 1,
                                 ThresholdResolution::cv_pllDefault,
                                 i_mfgThresh ) ),
-    iv_dumpContent(i_hwdc)   //dg08a
+    iv_dumpContent(i_hwdc)
 {}
 
+#endif // not __HOSTBOOT_MODULE
+
 //------------------------------------------------------------------------------
 
 } // end namespace PRDF
diff --git a/src/usr/diag/prdf/framework/config/prdfRuleChipDomain.C b/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.C
index 177a0182e..212fbe993 100755
--- a/src/usr/diag/prdf/framework/config/prdfRuleChipDomain.C
+++ b/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfRuleChipDomain.C $     */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfRuleChipDomain.H b/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H
index af9cd7fa4..9b3fb7654 100755
--- a/src/usr/diag/prdf/framework/config/prdfRuleChipDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfRuleChipDomain.H $     */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/prdfSystemSpecific.H b/src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H
index f9d9d0e1c..295c67486 100755
--- a/src/usr/diag/prdf/framework/config/prdfSystemSpecific.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/prdfSystemSpecific.H $     */
+/* $Source: src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -47,7 +47,7 @@
 
 namespace PrdfSystemSpecific
 {
-    Configurator * getConfiguratorPtr();
+    PRDF::Configurator * getConfiguratorPtr();
     void postAnalysisWorkarounds(STEP_CODE_DATA_STRUCT & i_sdc);
 };
 
diff --git a/src/usr/diag/prdf/framework/config/xspprdAccessPllChip.C b/src/usr/diag/prdf/common/framework/config/xspprdAccessPllChip.C
index 26b94d65f..b1f2b91e9 100755
--- a/src/usr/diag/prdf/framework/config/xspprdAccessPllChip.C
+++ b/src/usr/diag/prdf/common/framework/config/xspprdAccessPllChip.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/xspprdAccessPllChip.C $    */
+/* $Source: src/usr/diag/prdf/common/framework/config/xspprdAccessPllChip.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/config/xspprdAccessPllChip.h b/src/usr/diag/prdf/common/framework/config/xspprdAccessPllChip.h
index 1c771330f..7abc4d237 100755
--- a/src/usr/diag/prdf/framework/config/xspprdAccessPllChip.h
+++ b/src/usr/diag/prdf/common/framework/config/xspprdAccessPllChip.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/config/xspprdAccessPllChip.h $    */
+/* $Source: src/usr/diag/prdf/common/framework/config/xspprdAccessPllChip.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -38,9 +38,7 @@
 // Includes
 //--------------------------------------------------------------------
 
-#if !defined(IIPCHIP_H)
-    #include <iipchip.h>
-#endif
+#include <iipchip.h>
 
 //--------------------------------------------------------------------
 //  Forward References
diff --git a/src/usr/diag/prdf/framework/register/iipCaptureData.h b/src/usr/diag/prdf/common/framework/register/iipCaptureData.h
index 46601f0ca..eaa25b163 100755
--- a/src/usr/diag/prdf/framework/register/iipCaptureData.h
+++ b/src/usr/diag/prdf/common/framework/register/iipCaptureData.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipCaptureData.h $       */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipCaptureData.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipErrorRegister.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegister.h
index eaacfd893..82508fe19 100755
--- a/src/usr/diag/prdf/framework/register/iipErrorRegister.h
+++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegister.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipErrorRegister.h $     */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipErrorRegister.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipErrorRegisterFilter.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h
index fd330b852..71b016926 100755
--- a/src/usr/diag/prdf/framework/register/iipErrorRegisterFilter.h
+++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipErrorRegisterFilter.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipErrorRegisterMask.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
index d10ccb8d9..c5b9087b3 100755
--- a/src/usr/diag/prdf/framework/register/iipErrorRegisterMask.h
+++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipErrorRegisterMask.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipErrorRegisterSet.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterSet.h
index 29cb0c69b..0d91dd719 100755
--- a/src/usr/diag/prdf/framework/register/iipErrorRegisterSet.h
+++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterSet.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipErrorRegisterSet.h $  */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipErrorRegisterSet.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipErrorRegisterType.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h
index 83325f27c..85c5a3309 100755
--- a/src/usr/diag/prdf/framework/register/iipErrorRegisterType.h
+++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipErrorRegisterType.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipMopRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.C
index 00a83c7d3..66977cb13 100755
--- a/src/usr/diag/prdf/framework/register/iipMopRegisterAccess.C
+++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipMopRegisterAccess.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipMopRegisterAccess.h b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h
index 053ff867a..dd08c14b9 100755
--- a/src/usr/diag/prdf/framework/register/iipMopRegisterAccess.h
+++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipMopRegisterAccess.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipMopRegisterAccess.inl b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.inl
index a73c5ed4e..1bb95f597 100755
--- a/src/usr/diag/prdf/framework/register/iipMopRegisterAccess.inl
+++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipMopRegisterAccess.inl $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.inl $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipMopRegisterAccessScanComm.h b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h
index daf257e3e..1824ac174 100755
--- a/src/usr/diag/prdf/framework/register/iipMopRegisterAccessScanComm.h
+++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipMopRegisterAccessScanComm.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipMopRegisterAccessScanComm.inl b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.inl
index 84c99c4c0..7d1c59227 100755
--- a/src/usr/diag/prdf/framework/register/iipMopRegisterAccessScanComm.inl
+++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipMopRegisterAccessScanComm.inl $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.inl $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipResetErrorRegister.h b/src/usr/diag/prdf/common/framework/register/iipResetErrorRegister.h
index 89c0bea86..90e17d47d 100755
--- a/src/usr/diag/prdf/framework/register/iipResetErrorRegister.h
+++ b/src/usr/diag/prdf/common/framework/register/iipResetErrorRegister.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipResetErrorRegister.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipResetErrorRegister.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.C
index b34c4bb74..675bff0a2 100755
--- a/src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.C
+++ b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.h b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.h
index 48b849022..965d34fe6 100755
--- a/src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.h
+++ b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.inl b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.inl
index 547391a29..f78d46708 100755
--- a/src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.inl
+++ b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipScanCommRegisterAccess.inl $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipScanCommRegisterAccess.inl $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipScanCommRegisterChip.C b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterChip.C
index 977cf73d0..72300c691 100755
--- a/src/usr/diag/prdf/framework/register/iipScanCommRegisterChip.C
+++ b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterChip.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipScanCommRegisterChip.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipScanCommRegisterChip.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipScanCommRegisterChip.h b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterChip.h
index a1a7c9608..035cb42d0 100755
--- a/src/usr/diag/prdf/framework/register/iipScanCommRegisterChip.h
+++ b/src/usr/diag/prdf/common/framework/register/iipScanCommRegisterChip.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipScanCommRegisterChip.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipScanCommRegisterChip.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipXorResetErrorRegister.h b/src/usr/diag/prdf/common/framework/register/iipXorResetErrorRegister.h
index 07a0b7cd7..ce41875aa 100755
--- a/src/usr/diag/prdf/framework/register/iipXorResetErrorRegister.h
+++ b/src/usr/diag/prdf/common/framework/register/iipXorResetErrorRegister.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipXorResetErrorRegister.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipXorResetErrorRegister.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipscr.C b/src/usr/diag/prdf/common/framework/register/iipscr.C
index ee0166f4e..0462f2a51 100755
--- a/src/usr/diag/prdf/framework/register/iipscr.C
+++ b/src/usr/diag/prdf/common/framework/register/iipscr.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipscr.C $               */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipscr.C $        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/iipscr.h b/src/usr/diag/prdf/common/framework/register/iipscr.h
index 7fc70f9b2..cd4fb4f83 100755
--- a/src/usr/diag/prdf/framework/register/iipscr.h
+++ b/src/usr/diag/prdf/common/framework/register/iipscr.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/iipscr.h $               */
+/* $Source: src/usr/diag/prdf/common/framework/register/iipscr.h $        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfCaptureData.C b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
index 715a5aec3..29b62f596 100755
--- a/src/usr/diag/prdf/framework/register/prdfCaptureData.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfCaptureData.C $      */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfCaptureData.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C
index 469891454..9d5488678 100755
--- a/src/usr/diag/prdf/framework/register/prdfErrorRegister.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfErrorRegister.C $    */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfErrorRegisterMask.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C
index 21d5dc53b..680dfde66 100755
--- a/src/usr/diag/prdf/framework/register/prdfErrorRegisterMask.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfErrorRegisterMask.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
index b17e8f4ac..aaca68beb 100755
--- a/src/usr/diag/prdf/framework/register/prdfHomRegisterAccess.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfHomRegisterAccess.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfHomRegisterAccess.H b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H
index a0e9bca7d..1427dcb4d 100755
--- a/src/usr/diag/prdf/framework/register/prdfHomRegisterAccess.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfHomRegisterAccess.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfOperatorRegister.H b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
index b7bce1f55..266999f25 100755
--- a/src/usr/diag/prdf/framework/register/prdfOperatorRegister.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfOperatorRegister.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfResetErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
index e44d13bbe..0f0a6deec 100755
--- a/src/usr/diag/prdf/framework/register/prdfResetErrorRegister.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfResetErrorRegister.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfResetOperators.H b/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
index 3538de220..cd6985831 100755
--- a/src/usr/diag/prdf/framework/register/prdfResetOperators.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfResetOperators.H $   */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfResetOperators.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfScanFacility.C b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.C
index 2563bb0cc..5228f9a87 100755
--- a/src/usr/diag/prdf/framework/register/prdfScanFacility.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfScanFacility.C $     */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfScanFacility.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/prdfScanFacility.H b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H
index 237234e59..58e711b08 100755
--- a/src/usr/diag/prdf/framework/register/prdfScanFacility.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/prdfScanFacility.H $     */
+/* $Source: src/usr/diag/prdf/common/framework/register/prdfScanFacility.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/register/xspprdAndResetErrorRegister.h b/src/usr/diag/prdf/common/framework/register/xspprdAndResetErrorRegister.h
index 467dcb52a..fea03d7d2 100755
--- a/src/usr/diag/prdf/framework/register/xspprdAndResetErrorRegister.h
+++ b/src/usr/diag/prdf/common/framework/register/xspprdAndResetErrorRegister.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/register/xspprdAndResetErrorRegister.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/register/xspprdAndResetErrorRegister.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipAnalyzeChipResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h
index bc918e1f5..a35c7968e 100755
--- a/src/usr/diag/prdf/framework/resolution/iipAnalyzeChipResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipAnalyzeChipResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipCallAttnResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h
index 1501edf82..3a2283e2b 100755
--- a/src/usr/diag/prdf/framework/resolution/iipCallAttnResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipCallAttnResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipCallResolutionTemplate.h b/src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h
index f63905caf..ac25b5f11 100755
--- a/src/usr/diag/prdf/framework/resolution/iipCallResolutionTemplate.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipCallResolutionTemplate.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipCallout.h b/src/usr/diag/prdf/common/framework/resolution/iipCallout.h
index a0baa743e..e2d50a5bb 100755
--- a/src/usr/diag/prdf/framework/resolution/iipCallout.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCallout.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipCallout.h $         */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipCallout.h $  */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipCalloutMap.h b/src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h
index 28f9fbc77..bbec65bac 100755
--- a/src/usr/diag/prdf/framework/resolution/iipCalloutMap.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipCalloutMap.h $      */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipCalloutResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h
index 6f373ec5c..2c8ab7404 100755
--- a/src/usr/diag/prdf/framework/resolution/iipCalloutResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipCalloutResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipCaptureResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h
index 3ce055018..89829f651 100755
--- a/src/usr/diag/prdf/framework/resolution/iipCaptureResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipCaptureResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipEregResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h
index 5aa3d31db..8042c2901 100755
--- a/src/usr/diag/prdf/framework/resolution/iipEregResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipEregResolution.h $  */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
index c1cb0be6b..c68c5190a 100755
--- a/src/usr/diag/prdf/framework/resolution/iipResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipResolution.C $      */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipResolution.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipResolution.h
index 4211d563b..32123c585 100755
--- a/src/usr/diag/prdf/framework/resolution/iipResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipResolution.h $      */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipResolutionFactory.C b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C
index 14c931db8..158a5842e 100755
--- a/src/usr/diag/prdf/framework/resolution/iipResolutionFactory.C
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipResolutionFactory.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipResolutionFactory.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h
index e3ff286da..a37fdfa98 100755
--- a/src/usr/diag/prdf/framework/resolution/iipResolutionFactory.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipResolutionFactory.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipResolutionList.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h
index 96c2ad8b5..61ceca97c 100755
--- a/src/usr/diag/prdf/framework/resolution/iipResolutionList.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipResolutionList.h $  */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipResolutionMap.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionMap.h
index 4b1f10ebc..04dab5482 100755
--- a/src/usr/diag/prdf/framework/resolution/iipResolutionMap.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionMap.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipResolutionMap.h $   */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipResolutionMap.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipTerminateResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h
index 51843628d..0e86c85d9 100755
--- a/src/usr/diag/prdf/framework/resolution/iipTerminateResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipTerminateResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/iipThresholdResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipThresholdResolution.h
index a6e9ff668..41da01a7a 100755
--- a/src/usr/diag/prdf/framework/resolution/iipThresholdResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipThresholdResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/iipThresholdResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/iipThresholdResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfAnalyzeConnected.H b/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H
index 18d17b13a..c8598f4a8 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfAnalyzeConnected.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfAnalyzeConnected.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfCalloutConnected.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H
index 3629f2055..3301daf7d 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfCalloutConnected.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfCalloutConnected.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfCalloutMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H
index 48eed6bec..a6b4ba8bf 100644
--- a/src/usr/diag/prdf/framework/resolution/prdfCalloutMap.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfCalloutMap.H $     */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfCallouts.H b/src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H
index 87a3fd9e5..183ffb0ad 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfCallouts.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfCallouts.H $       */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfCaptureResolution.C b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C
index 2c8228269..183368389 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfCaptureResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfCaptureResolution.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfCaptureResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H
index 223668d64..e00d1cd7b 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfCaptureResolution.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfCaptureResolution.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfClockResolution.C b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C
index f572b7155..e9590a995 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfClockResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfClockResolution.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -42,7 +42,7 @@ int32_t PrdfClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData)
 
     uint32_t l_rc = SUCCESS;
     // Use clock routines for CLOCK_CARD types.
-    // FIXME: The target needs to be compared with valid clock targets.
+    // FIXME: RTC: 51628 will address clock target issue
     if ( (iv_targetType == TYPE_PROC) || (iv_targetType == TYPE_MEMBUF) )
     {
         // Get clock card.
@@ -63,13 +63,14 @@ int32_t PrdfClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData)
         }
 
         //Just callout the clock source.
-        serviceData.service_data->SetCallout(l_ptargetClock);
+        //There is no clock target now so we don't want to make
+        //any incorrect callout until it's implemented.
+        //serviceData.service_data->SetCallout(l_ptargetClock);
     }
     // Get all connected chips for non-CLOCK_CARD types.
     else
     {
         //Callout every device connected to this clock source.
-        // FIXME: Clock targets will need to be supported in getConnected().
         TargetHandleList l_targetsConnectedToClock =
                 PlatServices::getConnected( iv_ptargetClock, iv_targetType );
 
@@ -85,9 +86,3 @@ int32_t PrdfClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData)
     return(l_rc);
 }
 
-// Change Log *********************************************************
-//
-//  Flag Reason   Vers    Date     Coder    Description
-//  ---- -------- ------- -------- -------- ------------------------------
-//       D725180  fips720 09/30/09 lukas    Initial file creation.
-// End Change Log *****************************************************
diff --git a/src/usr/diag/prdf/framework/resolution/prdfClockResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H
index fcc3d5834..995522197 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfClockResolution.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfClockResolution.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfErrorTypeResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H
index e6cc7c493..2b917d9fc 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfErrorTypeResolution.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfErrorTypeResolution.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfIntervalThresholdResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfIntervalThresholdResolution.H
index 072874829..25bf5ee0d 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfIntervalThresholdResolution.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfIntervalThresholdResolution.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfIntervalThresholdResolution.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfIntervalThresholdResolution.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfPluginCallResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H
index 80e1e2a1f..95c97fecf 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfPluginCallResolution.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfPluginCallResolution.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfResetThresholdResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfResetThresholdResolution.H
index 1cb23d358..f991d4bb5 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfResetThresholdResolution.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfResetThresholdResolution.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfResetThresholdResolution.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfResetThresholdResolution.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfResolutionList.H b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H
index 5c1901788..1436e341b 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfResolutionList.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfResolutionList.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfResolutionMap.C b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C
index cb6dec7b5..ced75c0e9 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfResolutionMap.C
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfResolutionMap.C $  */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfResolutionMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H
index c0864d52b..197a5f429 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfResolutionMap.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfResolutionMap.H $  */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfThresholdResolutions.C b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C
index 24c167c06..f89adbbd2 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfThresholdResolutions.C
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfThresholdResolutions.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/prdfThresholdResolutions.H b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H
index 7bccc7c62..9d17a3879 100755
--- a/src/usr/diag/prdf/framework/resolution/prdfThresholdResolutions.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/prdfThresholdResolutions.H $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdDumpResolution.C b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C
index 2e9457931..dc843396a 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdDumpResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdDumpResolution.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdDumpResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h
index f8749f1ec..73400f2d8 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdDumpResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdDumpResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdFlagResolution.C b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C
index 7331bf728..16eb3572f 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdFlagResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdFlagResolution.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdFlagResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h
index 876b25e2f..f1267b994 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdFlagResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdFlagResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdGardResolution.C b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C
index 483c18eb2..88ea83333 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdGardResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdGardResolution.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdGardResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h
index 70ae9d727..4c1462f9a 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdGardResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdGardResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/resolution/xspprdTryResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h
index c9f4dd5e1..2dcf9cffc 100755
--- a/src/usr/diag/prdf/framework/resolution/xspprdTryResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/resolution/xspprdTryResolution.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/iipTemplates.C b/src/usr/diag/prdf/common/framework/rule/iipTemplates.C
index b5d7629c8..8d8572ca2 100755
--- a/src/usr/diag/prdf/framework/rule/iipTemplates.C
+++ b/src/usr/diag/prdf/common/framework/rule/iipTemplates.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/iipTemplates.C $             */
+/* $Source: src/usr/diag/prdf/common/framework/rule/iipTemplates.C $      */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfGroup.C b/src/usr/diag/prdf/common/framework/rule/prdfGroup.C
index 2b10643aa..c80ab4aaa 100755
--- a/src/usr/diag/prdf/framework/rule/prdfGroup.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfGroup.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfGroup.C $                */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfGroup.C $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfGroup.H b/src/usr/diag/prdf/common/framework/rule/prdfGroup.H
index 4bf12ab0a..cad9822f2 100755
--- a/src/usr/diag/prdf/framework/rule/prdfGroup.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdfGroup.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfGroup.H $                */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfGroup.H $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfPluginDef.H b/src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H
index 3b03d01b7..16e198860 100755
--- a/src/usr/diag/prdf/framework/rule/prdfPluginDef.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfPluginDef.H $            */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfPluginDef.H $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfPluginMap.C b/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C
index a2dfa838e..6a776d7e8 100755
--- a/src/usr/diag/prdf/framework/rule/prdfPluginMap.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfPluginMap.C $            */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfPluginMap.C $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfPluginMap.H b/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H
index b9344cb1c..dea82cd97 100755
--- a/src/usr/diag/prdf/framework/rule/prdfPluginMap.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfPluginMap.H $            */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfPluginMap.H $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfRuleChip.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C
index 5a0f1f5d1..50d054122 100755
--- a/src/usr/diag/prdf/framework/rule/prdfRuleChip.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfRuleChip.C $             */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C $      */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfRuleChip.H b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H
index 9c0b0859f..054a05971 100755
--- a/src/usr/diag/prdf/framework/rule/prdfRuleChip.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfRuleChip.H $             */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleChip.H $      */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfRuleFiles.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C
index 4be2704ea..23e90e98d 100755
--- a/src/usr/diag/prdf/framework/rule/prdfRuleFiles.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfRuleFiles.C $            */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.C $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdfRuleFiles.H b/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H
index 6515bd7df..9f9777445 100755
--- a/src/usr/diag/prdf/framework/rule/prdfRuleFiles.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdfRuleFiles.H $            */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdfRuleFiles.H $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrChip.H b/src/usr/diag/prdf/common/framework/rule/prdrChip.H
index ea1826d11..51d90b23e 100755
--- a/src/usr/diag/prdf/framework/rule/prdrChip.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrChip.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrChip.H $                 */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrChip.H $          */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrCommon.H b/src/usr/diag/prdf/common/framework/rule/prdrCommon.H
index 46a20cd62..47502a1be 100755
--- a/src/usr/diag/prdf/framework/rule/prdrCommon.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCommon.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrCommon.H $               */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCommon.H $        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
index 4f9028953..b379e3f95 100755
--- a/src/usr/diag/prdf/framework/rule/prdrCompile.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrCompile.C $              */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCompile.C $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrCompile.lex b/src/usr/diag/prdf/common/framework/rule/prdrCompile.lex
index 1c9ee1f54..dccb64828 100755
--- a/src/usr/diag/prdf/framework/rule/prdrCompile.lex
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.lex
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrCompile.lex $            */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCompile.lex $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrCompile.y b/src/usr/diag/prdf/common/framework/rule/prdrCompile.y
index 3de83cb2b..f5e98391e 100755
--- a/src/usr/diag/prdf/framework/rule/prdrCompile.y
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.y
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrCompile.y $              */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrCompile.y $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -824,10 +824,10 @@ time_units:
     {
         $$ = new PrdrExprTime(0xffffffff, Prdr::PRDR_TIME_BASE_SEC);
     }
-    // FIXME: It is impossible to reach a theshold of 1000 per second because
-    //        PRD cannot respond to attentions that quickly (at least on the
-    //        FSP). Need to add code to check if the threshold is possible to
-    //        based on the reaction type per attention ratio. (RTC: 51218)
+    // FIXME: (RTC 51218) It is impossible to reach a theshold of 1000 per
+    //        second because PRD cannot respond to attentions that quickly (at
+    //        least on the FSP). Need to add code to check if the threshold is
+    //        possible to based on the reaction type per attention ratio.
     | '/' PRDR_TIME_SEC
     {
         $$ = new PrdrExprTime(1, Prdr::PRDR_TIME_BASE_SEC);
diff --git a/src/usr/diag/prdf/framework/rule/prdrExpr.H b/src/usr/diag/prdf/common/framework/rule/prdrExpr.H
index adb32fad9..dd3748b9c 100755
--- a/src/usr/diag/prdf/framework/rule/prdrExpr.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrExpr.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrExpr.H $                 */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrExpr.H $          */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -202,8 +202,6 @@ class PrdrExprTime : public PrdrExpr
                           std::string  & o_trailing,
                           std::ostream & o_errFile = std::cerr )
     {
-        uint32_t seconds = iv_units * iv_base;
-
         o_stream << iv_units << " ";
         switch ( iv_base )
         {
diff --git a/src/usr/diag/prdf/framework/rule/prdrGroup.H b/src/usr/diag/prdf/common/framework/rule/prdrGroup.H
index ee0f1026b..5d310ba9b 100755
--- a/src/usr/diag/prdf/framework/rule/prdrGroup.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrGroup.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrGroup.H $                */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrGroup.H $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrLoadChip.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C
index c885c55c9..dd76a6234 100755
--- a/src/usr/diag/prdf/framework/rule/prdrLoadChip.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrLoadChip.C $             */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C $      */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrLoadChip.H b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H
index 40b7b18c1..4a54e5f1e 100755
--- a/src/usr/diag/prdf/framework/rule/prdrLoadChip.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrLoadChip.H $             */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChip.H $      */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrLoadChipCache.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
index 75918e4a1..a23e286aa 100755
--- a/src/usr/diag/prdf/framework/rule/prdrLoadChipCache.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrLoadChipCache.C $        */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrLoadChipCache.H b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H
index 6089bd426..16ecb5762 100755
--- a/src/usr/diag/prdf/framework/rule/prdrLoadChipCache.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrLoadChipCache.H $        */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrRegister.H b/src/usr/diag/prdf/common/framework/rule/prdrRegister.H
index d635652f6..ac005899b 100755
--- a/src/usr/diag/prdf/framework/rule/prdrRegister.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrRegister.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrRegister.H $             */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrRegister.H $      */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrSignatures.H b/src/usr/diag/prdf/common/framework/rule/prdrSignatures.H
index 83debdbed..eb5223005 100755
--- a/src/usr/diag/prdf/framework/rule/prdrSignatures.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrSignatures.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrSignatures.H $           */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrSignatures.H $    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrToken.H b/src/usr/diag/prdf/common/framework/rule/prdrToken.H
index 859cacd76..38e7bb061 100755
--- a/src/usr/diag/prdf/framework/rule/prdrToken.H
+++ b/src/usr/diag/prdf/common/framework/rule/prdrToken.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/rule/prdrToken.H $                */
+/* $Source: src/usr/diag/prdf/common/framework/rule/prdrToken.H $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/prdrpp b/src/usr/diag/prdf/common/framework/rule/prdrpp
index bbfc5e6fa..de808f420 100755
--- a/src/usr/diag/prdf/framework/rule/prdrpp
+++ b/src/usr/diag/prdf/common/framework/rule/prdrpp
@@ -1,26 +1,26 @@
 #!/usr/bin/perl
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/framework/rule/prdrpp $
-# 
+#
+# $Source: src/usr/diag/prdf/common/framework/rule/prdrpp $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2004,2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 use strict;
 
diff --git a/src/usr/diag/prdf/framework/rule/tables.mk b/src/usr/diag/prdf/common/framework/rule/tables.mk
index 200fff8e4..6c0ee1823 100755
--- a/src/usr/diag/prdf/framework/rule/tables.mk
+++ b/src/usr/diag/prdf/common/framework/rule/tables.mk
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/framework/rule/tables.mk $
-# 
+#
+# $Source: src/usr/diag/prdf/common/framework/rule/tables.mk $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2005,2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 #-------------------------------------------------------------------
 # To add a new chip, modify PRDR_RULE_TABLES line.
@@ -27,6 +27,7 @@
 #-------------------------------------------------------------------
 
 # Add Rule tables here:
+# FIXME: This is now a duplicate of PRDR_RULE_TABLE_TARGETS in prd_ruletable.mk
 PRDR_RULE_TABLES = \
 	Proc.prf \
 	Ex.prf \
@@ -34,7 +35,6 @@ PRDR_RULE_TABLES = \
 	Membuf.prf \
 	Mba.prf
 
-
 #------------------------------------------------------------------
 # Change nothing below this line unless you know what you're doing!
 #------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/framework/service/iipServiceDataCollector.h b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
index 94dbc4d27..fd9083c3b 100755
--- a/src/usr/diag/prdf/framework/service/iipServiceDataCollector.h
+++ b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/iipServiceDataCollector.h $ */
+/* $Source: src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/iipServiceDataCollector.inl b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl
index 956968c75..3ea5f4989 100755
--- a/src/usr/diag/prdf/framework/service/iipServiceDataCollector.inl
+++ b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/iipServiceDataCollector.inl $ */
+/* $Source: src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/iipsdbug.h b/src/usr/diag/prdf/common/framework/service/iipsdbug.h
index 132ed2dc1..4d83ecaf3 100755
--- a/src/usr/diag/prdf/framework/service/iipsdbug.h
+++ b/src/usr/diag/prdf/common/framework/service/iipsdbug.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/iipsdbug.h $              */
+/* $Source: src/usr/diag/prdf/common/framework/service/iipsdbug.h $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/iipstep.h b/src/usr/diag/prdf/common/framework/service/iipstep.h
index ef20bcec8..3a0ff6d60 100755
--- a/src/usr/diag/prdf/framework/service/iipstep.h
+++ b/src/usr/diag/prdf/common/framework/service/iipstep.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/iipstep.h $               */
+/* $Source: src/usr/diag/prdf/common/framework/service/iipstep.h $        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfPfa5Data.h b/src/usr/diag/prdf/common/framework/service/prdfPfa5Data.h
index 1ea0cc5c0..ebeb22254 100755
--- a/src/usr/diag/prdf/framework/service/prdfPfa5Data.h
+++ b/src/usr/diag/prdf/common/framework/service/prdfPfa5Data.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPfa5Data.h $          */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfPfa5Data.h $   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices.C
index 07ab94da3..9c6173c51 100755
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPlatServices.C $      */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfPlatServices.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -45,6 +45,8 @@
   #include <sys/time.h>
   #include <diag/mdia/mdia.H>
   #include <diag/mdia/mdiamevent.H>
+  #include <fapiPlatHwpInvoker.H>
+  #include <dimmBadDqBitmapFuncs.H>
 #else
   #include <iplp_registry.H>
   #include <mboxclientlib.H>
@@ -225,6 +227,7 @@ enum
     MNFG_THRESHOLDS = 0,
     MNFG_HDAT_AVP_ENABLE,
     MNFG_SRC_TERM,
+    MNFG_NO_RBS,
 };
 
 #endif
@@ -267,6 +270,7 @@ bool isMnfgFlagSet( uint32_t i_flag )
 bool mfgMode()       { return isMnfgFlagSet( MNFG_THRESHOLDS      ); }
 bool hdatAvpMode()   { return isMnfgFlagSet( MNFG_HDAT_AVP_ENABLE ); }
 bool mnfgTerminate() { return isMnfgFlagSet( MNFG_SRC_TERM        ); }
+bool areDramRepairsDisabled() { return isMnfgFlagSet( MNFG_NO_RBS ); }
 
 //##############################################################################
 //##                        Memory specific functions
@@ -293,21 +297,6 @@ getDimmPlugCardType()
 //------------------------------------------------------------------------------
 
 /* TODO
-int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mbaTarget
-                        const uint8_t i_portSlct,
-                        const uint8_t i_dimmSlct,
-                        const uint8_t i_rankSlct,
-                        uint8_t (&o_data)[DIMM_DQ_RANK_BITMAP_SIZE] )
-{
-    int32_t o_rc = SUCCESS;
-
-    // TODO: Call dimmGetBadDqBitmap() in dimmBadDqBitmapFuncs.H.
-    // NOTE: DIMM_DQ_RANK_BITMAP_SIZE is in dimmConsts.H
-    // NOTE: Will need to convert TARGETING::TargetHandle_t to fapi::Target.
-
-    return o_rc;
-}
-
 //------------------------------------------------------------------------------
 
 int32_t setBadDqBitmap( TARGETING::TargetHandle_t i_mbaTarget
@@ -389,6 +378,131 @@ int32_t mdiaSendCmdComplete( TARGETING::TargetHandle_t i_mbaTarget )
     return o_rc;
 }
 
+int32_t mssGetMarkStore(
+        TARGETING::TargetHandle_t i_mbaTarget,
+        uint8_t i_rank,
+        uint8_t & o_chipMark,
+        uint8_t & o_symbolMark)
+{
+    int32_t o_rc = SUCCESS;
+
+    errlHndl_t err = NULL;
+
+    FAPI_INVOKE_HWP(
+            err,
+            mss_get_mark_store,
+            fapi::Target(fapi::TARGET_TYPE_MBA_CHIPLET, i_mbaTarget),
+            i_rank,
+            o_chipMark,
+            o_symbolMark);
+
+    if(NULL != err)
+    {
+        PRDF_ERR( "[PlatServices::mssGetMarkStore] mss_get_mark_store"
+                "failed" );
+        PRDF_COMMIT_ERRL( err, ERRL_ACTION_REPORT );
+        o_rc = FAIL;
+    }
+
+    return o_rc;
+}
+
+int32_t mssGetSteerMux(
+        TARGETING::TargetHandle_t i_mbaTarget,
+        uint8_t i_rank,
+        mss_SteerMux::muxType i_muxType,
+        uint8_t & o_portZeroSpare,
+        uint8_t & o_portOneSpare,
+        uint8_t & o_eccSpare)
+{
+    int32_t o_rc = SUCCESS;
+
+    errlHndl_t err = NULL;
+
+    FAPI_INVOKE_HWP(
+            err,
+            mss_get_steer_mux,
+            fapi::Target(fapi::TARGET_TYPE_MBA_CHIPLET, i_mbaTarget),
+            i_rank,
+            i_muxType,
+            o_portZeroSpare,
+            o_portOneSpare,
+            o_eccSpare);
+
+    if(NULL != err)
+    {
+        PRDF_ERR( "[PlatServices::mssGetSteerMux] mss_get_steer_mux"
+                "failed" );
+        PRDF_COMMIT_ERRL( err, ERRL_ACTION_REPORT );
+        o_rc = FAIL;
+    }
+
+    return o_rc;
+
+}
+
+int32_t mssRestoreDramRepairs(
+        TARGETING::TargetHandle_t i_mbaTarget,
+        uint8_t & o_repairedRankMask,
+        uint8_t & o_badDimmMask)
+{
+    int32_t o_rc = SUCCESS;
+
+    errlHndl_t err = NULL;
+
+    // FIXME uncomment when this function exists ... RTC 51507
+
+#if 0
+
+    FAPI_INVOKE_HWP(
+            err,
+            mss_restore_dram_repairs,
+            fapi::Target(fapi::TARGET_TYPE_MBA_CHIPLET, i_mbaTarget),
+            o_repairedRankMask,
+            o_badDimmMask);
+#endif
+
+    if(NULL != err)
+    {
+        PRDF_ERR( "[PlatServices::mssRestoreDramRepairs] "
+                "mss_restore_dram_repairs failed" );
+        PRDF_COMMIT_ERRL( err, ERRL_ACTION_REPORT );
+        o_rc = FAIL;
+    }
+
+    return o_rc;
+}
+
+int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mbaTarget,
+        const uint8_t i_portSlct,
+        const uint8_t i_dimmSlct,
+        const uint8_t i_rankSlct,
+        uint8_t (&o_data)[DIMM_DQ_RANK_BITMAP_SIZE] )
+{
+    int32_t o_rc = SUCCESS;
+
+    errlHndl_t err = NULL;
+
+    FAPI_INVOKE_HWP(
+            err,
+            dimmGetBadDqBitmap,
+            fapi::Target(fapi::TARGET_TYPE_MBA_CHIPLET, i_mbaTarget),
+            i_portSlct,
+            i_dimmSlct,
+            i_rankSlct,
+            o_data);
+
+    if(NULL != err)
+    {
+        PRDF_ERR( "[PlatServices::getBadDqBitmap] dimmGetBadDqBitmap"
+                "failed" );
+        PRDF_COMMIT_ERRL( err, ERRL_ACTION_REPORT );
+        o_rc = FAIL;
+    }
+
+    return o_rc;
+}
+
 #endif // __HOSTBOOT_MODULE
 
 //##############################################################################
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.H b/src/usr/diag/prdf/common/framework/service/prdfPlatServices.H
index 5ab99bb44..50f21c9aa 100755
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPlatServices.H $      */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfPlatServices.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -40,6 +40,11 @@
 #include <prdfTimer.H>
 
 #include <errlentry.H>
+#include <dimmConsts.H>
+
+#ifdef __HOSTBOOT_MODULE
+  #include <dram_initialization/mss_memdiag/mss_maint_cmds.H>
+#endif
 
 //------------------------------------------------------------------------------
 
@@ -131,6 +136,12 @@ bool hdatAvpMode();
  */
 bool mnfgTerminate();
 
+/**
+ * @brief  Returns the state of the MNFG_NO_RBS policy flag.
+ * @return TRUE if MNFG_NO_RBS is set, FALSE otherwise.
+ */
+bool areDramRepairsDisabled();
+
 //##############################################################################
 //##                        Memory specific functions
 //##############################################################################
@@ -155,23 +166,6 @@ getDimmPlugCardType( TARGETING::TargetHandle_t i_dimmTarget );
 */
 
 /**
- * @brief   Reads the bad DQ bitmap attribute.
- * @param   i_mbaTarget A MBA target.
- * @param   i_portSlct  Port select (0-1).
- * @param   i_dimmSlct  DIMM select (0-1).
- * @param   i_rankSlct  Rank select (0-3).
- * @param   o_data      The return data array.
- * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
- */
-/* TODO - See .C
-int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mbaTarget
-                        const uint8_t i_portSlct,
-                        const uint8_t i_dimmSlct,
-                        const uint8_t i_rankSlct,
-                        uint8_t (&o_data)[DIMM_DQ_RANK_BITMAP_SIZE] );
-*/
-
-/**
  * @brief   Writes the bad DQ bitmap attribute.
  * @param   i_mbaTarget A MBA target.
  * @param   i_portSlct  Port select (0-1).
@@ -209,6 +203,66 @@ bool isInMdiaMode();
  */
 int32_t mdiaSendCmdComplete( TARGETING::TargetHandle_t i_mbaTarget );
 
+/**
+ * @brief  Invokes the get mark store hardware procedure.
+ * @param  i_mbaTarget
+ * @param  i_rank
+ * @param  o_chipMark
+ * @param  o_symbolMark
+ * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
+ */
+int32_t mssGetMarkStore(
+        TARGETING::TargetHandle_t i_mbaTarget,
+        uint8_t i_rank,
+        uint8_t & o_chipMark,
+        uint8_t & o_symbolMark);
+
+/**
+ * @brief  Invokes the get steer mux hardware procedure.
+ * @param  i_mbaTarget
+ * @param  i_rank
+ * @param  i_muxType Read/Write Mux select
+ * @param  o_portZeroSpare
+ * @param  o_portOneSpare
+ * @param  o_eccSpare
+ * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
+ */
+int32_t mssGetSteerMux(
+        TARGETING::TargetHandle_t i_mbaTarget,
+        uint8_t i_rank,
+        mss_SteerMux::muxType i_muxType,
+        uint8_t & o_portZeroSpare,
+        uint8_t & o_portOneSpare,
+        uint8_t & o_eccSpare);
+
+/**
+ * @brief  Invokes the restore DRAM repairs hardware procedure.
+ * @param  i_mbaTarget
+ * @param  o_repairedRankMask An encoded bitmask of repaired ranks.
+ * @param  o_badDimm An encoded bitmask of bad DIMMs.
+ * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
+ */
+int32_t mssRestoreDramRepairs(
+        TARGETING::TargetHandle_t i_mbaTarget,
+        uint8_t & o_repairedRankMask,
+        uint8_t & o_badDimmMask);
+
+/**
+ * @brief   Reads the bad DQ bitmap attribute.
+ * @param   i_mbaTarget A MBA target.
+ * @param   i_portSlct  Port select (0-1).
+ * @param   i_dimmSlct  DIMM select (0-1).
+ * @param   i_rankSlct  Rank select (0-3).
+ * @param   o_data      The return data array.
+ * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+ */
+// FIXME: Eventually needs to be supported in FSP code as well.
+int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mbaTarget,
+                        const uint8_t i_portSlct,
+                        const uint8_t i_dimmSlct,
+                        const uint8_t i_rankSlct,
+                        uint8_t (&o_data)[DIMM_DQ_RANK_BITMAP_SIZE] );
+
 #endif // __HOSTBOOT_MODULE
 
 //##############################################################################
diff --git a/src/usr/diag/prdf/framework/service/prdfServiceDataCollector.C b/src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C
index 8374b8434..6aa984cf6 100755
--- a/src/usr/diag/prdf/framework/service/prdfServiceDataCollector.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfServiceDataCollector.C $ */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -101,7 +101,16 @@ inline uint8_t buffer_get8(const uint8_t * &ptr)
     return l_tmp8;
 }
 
-inline TARGETING::TargetHandle_t  buffer_getTarget( const uint8_t *&ptr )
+inline void buffer_append( uint8_t *&ptr, const TARGETING::TargetHandle_t i_pGivenHandle )
+{
+    HUID l_targetHuid = PlatServices::getHuid( i_pGivenHandle );
+    l_targetHuid = htonl( l_targetHuid );
+    uint32_t l_size = sizeof( l_targetHuid );
+    memcpy( ptr, &l_targetHuid, l_size );
+    ptr += l_size;
+}
+
+inline TARGETING::TargetHandle_t buffer_getTarget( const uint8_t *&ptr )
 {
     HUID l_chipHuid = INVALID_HUID;
     uint32_t l_size = sizeof( l_chipHuid );
@@ -179,11 +188,10 @@ void ServiceDataCollector::AddSignatureList(TARGETING::TargetHandle_t i_pTargetH
     }
 }
 
+//------------------------------------------------------------------------------
 
 #ifndef __HOSTBOOT_MODULE
 
-//------------------------------------------------------------------------------
-
 uint32_t ServiceDataCollector::Flatten(uint8_t * i_buffer, uint32_t & io_size) const
 {
     uint32_t max_size = io_size;
@@ -268,44 +276,24 @@ uint32_t ServiceDataCollector::Flatten(uint8_t * i_buffer, uint32_t & io_size) c
 
 //------------------------------------------------------------------------------
 
-ServiceDataCollector & ServiceDataCollector::operator=(const uint8_t * i_flatdata)
+ServiceDataCollector & ServiceDataCollector::operator=(
+                                                    const uint8_t * i_flatdata )
 {
-    error_signature.setChipId(buffer_get32(i_flatdata));
+    error_signature.setChipId( buffer_get32(i_flatdata) );
     error_signature.setSigId(  buffer_get32(i_flatdata) );
 
-    uint32_t value = buffer_get32(i_flatdata);  // number of callouts
     ClearCallouts();
-    for(uint32_t i = 0; i < value; ++i)
+    uint32_t value = buffer_get32(i_flatdata); // number of callouts
+    for ( uint32_t i = 0; i < value; ++i )
     {
-        MruType mt = (MruType) buffer_get32(i_flatdata);  // callout type
-        if ( PRDcallout::TYPE_TARGET == mt )
-        {
-            // Retrieving target.
-            TARGETING::TargetHandle_t l_pChipHandle
-                                                = buffer_getTarget(i_flatdata);
-
-            if(NULL !=l_pChipHandle)
-            {
-                //Resurrecting prdcallout from all the data elements
-                PRDcallout callout((TARGETING::
-                                    TargetHandle_t)l_pChipHandle,
-                                    mt);
-                xMruList.push_back( SdcCallout( callout,
-                                                (PRDpriority)buffer_get32
-                                                (i_flatdata))
-                                              );  // callout priority
-            }
+        PRDcallout::MruType mt = (PRDcallout::MruType) buffer_get32(i_flatdata);
+        uint32_t mru           = buffer_get32(i_flatdata);
+        PRDpriority priority   = (PRDpriority) buffer_get32(i_flatdata);
 
-        }
-        else
-        {
-            uint32_t mru = buffer_get32(i_flatdata);  // other callouts
-            //Resurrecting prdcallout from all the data elements
-            PRDcallout callout(mru,mt);
-            xMruList.push_back( SdcCallout(callout,
-                                (PRDpriority)buffer_get32(i_flatdata)));  // callout priority
-        }
+        PRDcallout callout( mru, mt );
+        xMruList.push_back( SdcCallout(callout, priority) );
     }
+
     ClearHcdbList();
     value = buffer_get32(i_flatdata);  // number of HcdbEntries.
     for(uint32_t i = 0; i < value; ++i)
diff --git a/src/usr/diag/prdf/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
index 8958f787f..e4bc77500 100755
--- a/src/usr/diag/prdf/framework/service/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfTargetServices.C $    */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfTargetServices.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -983,19 +983,31 @@ int32_t isMembufOnDimm( TARGETING::TargetHandle_t i_memTarget,
     return o_rc;
 }
 
+int32_t getMbaPort( TARGETING::TargetHandle_t i_dimmTarget, uint8_t & o_port )
+{
+    using namespace TARGETING;
+    return i_dimmTarget->tryGetAttr<ATTR_MBA_PORT>(o_port) ? SUCCESS : FAIL;
+}
+
+int32_t getMbaDimm( TARGETING::TargetHandle_t i_dimmTarget, uint8_t & o_dimm )
+{
+    using namespace TARGETING;
+    return i_dimmTarget->tryGetAttr<ATTR_MBA_DIMM>(o_dimm) ? SUCCESS : FAIL;
+}
+
 //##############################################################################
 //##
 //##                        Clock specific functions
 //##
 //##############################################################################
 
+// FIXME: RTC: 51628 will address clock target issue
 bool areClocksOn(TARGETING::TargetHandle_t i_pGivenTarget)
 {
     bool o_clocksOn = false;
 
     #ifdef __HOSTBOOT_MODULE
 
-    // TODO No such target or attribute available for now
     o_clocksOn = true;
 
     #else
@@ -1003,7 +1015,6 @@ bool areClocksOn(TARGETING::TargetHandle_t i_pGivenTarget)
     if ( NULL != i_pGivenTarget )
     {
         errlHndl_t errl = NULL;
-        // TODO: all relevant header files are not exported yet
         //errl =HWSV::hwsvClockQueryOn(i_pGivenTarget,
         //                  HWSV::NO_MODE, o_clocksOn);
         if ( NULL != errl )
@@ -1024,6 +1035,7 @@ bool areClocksOn(TARGETING::TargetHandle_t i_pGivenTarget)
 
 //------------------------------------------------------------------------------
 
+// FIXME: RTC: 51628 will address clock target issue
 TARGETING::TargetHandle_t getClockId(TARGETING::TargetHandle_t
                             i_pGivenTarget,
                             TARGETING ::TYPE targetype)
@@ -1031,22 +1043,20 @@ TARGETING::TargetHandle_t getClockId(TARGETING::TargetHandle_t
     TargetHandleList l_clockCardlist;
     TargetHandle_t o_pClockCardHandle = NULL;
 
-    // TODO  Cards are not getting modeled for now
-    return o_pClockCardHandle ;
+    return o_pClockCardHandle;
 }
 
 //------------------------------------------------------------------------------
 
+// FIXME: RTC: 51628 will address clock target issue
 TARGETING::TargetHandle_t getClockMux(TARGETING::TargetHandle_t
                             i_pGivenTarget)
 {
     //Modeling info of card and Clock mux is required
-    //TODO specify correct association type needs to be determined.
     // PredicateCTM l_ClockMux(CLASS_UNIT,TYPE_CLOCK_MUX);
     //defined for compilation
     PredicateCTM l_ClockMux(CLASS_UNIT);
     TargetHandle_t o_ptargetClockMux = NULL;
-    //TODO: Clock support for target not present yet.
     #if 0
     do
     {
diff --git a/src/usr/diag/prdf/framework/service/prdfTargetServices.H b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
index 20eb9e089..5513e69cc 100755
--- a/src/usr/diag/prdf/framework/service/prdfTargetServices.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfTargetServices.H $    */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfTargetServices.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -304,6 +304,23 @@ uint32_t getMemChnl( TARGETING::TargetHandle_t i_memTarget );
  */
 bool isMembufOnDimm( TARGETING::TargetHandle_t i_memTarget );
 
+/**
+ * @brief   Obtain the MBA port select for the given Dimm.
+ * @param   i_dimmTarget Dimm.
+ * @param   o_port MBA port select.
+ * @return  Non-SUCCESS if internal functions fail, SUCCESS otherwise.
+ */
+int32_t getMbaPort( TARGETING::TargetHandle_t i_dimmTarget, uint8_t & o_port );
+
+
+/**
+ * @brief   Obtain the MBA Dimm select for the given Dimm.
+ * @param   i_dimmTarget Dimm.
+ * @param   o_dimm MBA Dimm select.
+ * @return  Non-SUCCESS if internal functions fail, SUCCESS otherwise.
+ */
+int32_t getMbaDimm( TARGETING::TargetHandle_t i_dimmTarget, uint8_t & o_dimm );
+
 //##############################################################################
 //##
 //##                        Clock specific functions
diff --git a/src/usr/diag/prdf/framework/service/prdfWorkarounds.H b/src/usr/diag/prdf/common/framework/service/prdfWorkarounds.H
index 4ace33863..bcea1a744 100755
--- a/src/usr/diag/prdf/framework/service/prdfWorkarounds.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfWorkarounds.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfWorkarounds.H $       */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdfWorkarounds.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdf_ras_services.C b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C
index 1e388032e..7831575e1 100755
--- a/src/usr/diag/prdf/framework/service/prdf_ras_services.C
+++ b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdf_ras_services.C $     */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdf_ras_services.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -1399,9 +1399,9 @@ will also be removed. Need to confirm if this code is required anymore.
     for ( SDC_MRU_LIST::iterator i = fspmrulist.begin();
           i < fspmrulist.end(); ++i )
     {
-        PRDF_DTRAC( "PRDTRACE: Callout: %x", (uint32_t)((*i).callout) );
+        PRDF_DTRAC( "PRDTRACE: Callout: %x", i->callout.flatten() );
 
-        switch ( (*i).priority )
+        switch ( i->priority )
         {
             case MRU_LOW:  PRDF_DTRAC( "PRDTRACE:   LOW" );   break;
             case MRU_MEDC: PRDF_DTRAC( "PRDTRACE:   MED_C" ); break;
diff --git a/src/usr/diag/prdf/framework/service/prdf_ras_services.H b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.H
index 84455b963..50d8c8f12 100755
--- a/src/usr/diag/prdf/framework/service/prdf_ras_services.H
+++ b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdf_ras_services.H $     */
+/* $Source: src/usr/diag/prdf/common/framework/service/prdf_ras_services.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/xspprdService.h b/src/usr/diag/prdf/common/framework/service/xspprdService.h
index bea7eb7a9..4c985ca39 100755
--- a/src/usr/diag/prdf/framework/service/xspprdService.h
+++ b/src/usr/diag/prdf/common/framework/service/xspprdService.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/xspprdService.h $         */
+/* $Source: src/usr/diag/prdf/common/framework/service/xspprdService.h $  */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/xspprdsdbug.C b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C
index d2dd1f262..8b52aecca 100755
--- a/src/usr/diag/prdf/framework/service/xspprdsdbug.C
+++ b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/xspprdsdbug.C $           */
+/* $Source: src/usr/diag/prdf/common/framework/service/xspprdsdbug.C $    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/iipconst.h b/src/usr/diag/prdf/common/iipconst.h
index 43e84c514..00fafb0fe 100755
--- a/src/usr/diag/prdf/iipconst.h
+++ b/src/usr/diag/prdf/common/iipconst.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/iipconst.h $                                */
+/* $Source: src/usr/diag/prdf/common/iipconst.h $                         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/iipglobl.h b/src/usr/diag/prdf/common/iipglobl.h
index bfed7bc22..f9b7e64f2 100755
--- a/src/usr/diag/prdf/iipglobl.h
+++ b/src/usr/diag/prdf/common/iipglobl.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/iipglobl.h $                                */
+/* $Source: src/usr/diag/prdf/common/iipglobl.h $                         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -162,8 +162,9 @@ namespace PRDF
 /**
  * @brief Commit the log
  */
-// FIXME : hberr does not use i_actions for commit
+// FIXME: hberr does not use i_actions for commit
 #define PRDF_COMMIT_ERRL(io_errl, i_actions) \
+    if(i_actions) {} \
     errlCommit(io_errl, PRDF_COMP_ID)
 
 /**
@@ -427,7 +428,7 @@ namespace PRDF
 #define PRDF_HW_COMMIT_ERRL(io_sysTerm, io_errl, i_deferDeconfig, \
                             i_action, i_continue)                 \
   io_sysTerm = false;  \
-  PRDF_COMMIT_ERRL(io_errl, i_actions);
+  PRDF_COMMIT_ERRL(io_errl, i_action);
 
 /**
  * @brief  indicate whether an abort is active or not
diff --git a/src/usr/diag/prdf/plat/pegasus/CommonActions.rule b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
index 028bb8fa7..44c8b559c 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/CommonActions.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/CommonActions.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 # This file is intended to create a common set of actionclasses for all rule
@@ -34,43 +34,38 @@
 ################################################################################
 #                           Thresholds and Flags                               #
 ################################################################################
-# FIXME These thresholds are just for demo purpose.
-# Its new format. Once team is comfortable with new format we can remove them
-# The syntax for new format is
-# threshold ( field (errorFrequency[ time_units, time_base ] ), mfg|mfg_file (errorFrequency[........]))
-# time_base can have sec|min|hour|day
-# NOTE : Time finally will be changed the seconds.Maximum value supported is 0xffffffff (around 49710 days)
-#        If more then this value is specified, it will be truncated
+
+# Threshold syntax:
+#   threshold( field(<timebase>) [, mfg(<timebase>)|mfg_file(<mfg_theshold>)] );
+#
+# Timebase syntax:
+#   <threshold_count> [/ [timbase_count] <sec|min|hour|day>]
+#
+# Note that <mfg_theshold> can be found in prdfMfgThresholds.lst
+# FIXME: mfg_file() is currently not supported in Hostboot because there
+#        currently is no way to get the values from the FSP command line to
+#        Hostboot.
+#
+# Examples:
+#   threshold( field( 1        ) );
+#   threshold( field(32 /   day) );
+#   threshold( field( 5 / 2 min) );
+#   threshold( field(32 / 1 day), mfg(2 / hour) );
+#   threshold( field( 2 /   min), mfg(1       ) );
+#   threshold( field(32 /   day), mfg_file(P7CORE_L2_CACHE_CES) );
+
 /** Threshold of 1 */
 actionclass threshold1
 {
-# Field threshold 1
-    threshold( field(1 / 0xffffffff sec) );
+    threshold( field(1) );
 };
 
-/** Threshold of 2 per month */
-actionclass threshold2pmonth
+/** Threshold of 32 per day */
+actionclass threshold32pday
 {
-# Field threshold 2 per  30 days
-    threshold( field(2 / 30 day) );
+    threshold( field(32 / day) );
 };
 
-/** Threshold of 1 , mfg 2 per min*/
-actionclass threshold1mfg2pmin
-{
-# Field threshold 1, mfg 2 per min
-# if in time base ( sec|min|hour|day) nothing is specified , by defaut it is sec
-    threshold( field(1), mfg (2/min) );
-};
-
-#FIXME: comment out so I can compile in Hostboot
-##/** Threshold of 1 per second , mfg threshold P7CORE_L2_CACHE_CES (from mnfg file) */
-#actionclass threshold1per1SecwithField
-#{
-# Field threshold 1 per second, mfg threshold will be taken from file
-#    threshold( field(1 / sec), mfg_file(P7CORE_L2_CACHE_CES) );
-#};
-
 ################################################################################
 #                               Simple Callouts                                #
 ################################################################################
diff --git a/src/usr/diag/prdf/plat/pegasus/Ex.rule b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
index d51ced0dd..56fd722b1 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Ex.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/plat/pegasus/Ex.rule $
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Ex.rule $
 #
 # IBM CONFIDENTIAL
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Mba.rule b/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
index 75a0c414c..8798e5c8a 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Mba.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mba.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Mba.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Mba.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Mcs.rule b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
index 19c99e96b..df57dc90e 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Mcs.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Mcs.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Mcs.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf.rule
index 549f2eac6..619b53c6a 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf_acts_MEM.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_MEM.rule
index 69b85f7b8..af8e5fbb5 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf_acts_MEM.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_MEM.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf_acts_MEM.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_MEM.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 # MEM Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf_acts_NEST.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_NEST.rule
index f94002527..98d08b766 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf_acts_NEST.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_NEST.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf_acts_NEST.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_NEST.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 # NEST Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf_acts_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_TP.rule
index 84d097c0c..913476351 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf_acts_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_TP.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf_acts_TP.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf_acts_TP.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 # TP Chiplet Registers
@@ -102,6 +102,23 @@ group gTpLFir filter singlebit
      *  Local errors from Trace Array ( error)
      */
     (TpLFir, bit(10|11)) ? TBDDefaultCallout;
+
+    /** TP_LFIR[18]
+     *  local errors from mem PLL
+     *
+     *  These should never trigger directly themselves.
+     *  Should be handled by global PRD PLL code.
+     */
+    (TpLFir, bit(18)) ? threshold32pday;
+
+    /** TP_LFIR[19]
+     *  local errors from nest PLL
+     *
+     *  These should never trigger directly themselves.
+     *  Should be handled by global PRD PLL code.
+     */
+    (TpLFir, bit(19)) ? threshold32pday;
+
 };
 
 ################################################################################
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf_regs_MEM.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule
index 5de564fe3..7c661a47f 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf_regs_MEM.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf_regs_MEM.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_MEM.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # MEM Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf_regs_NEST.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule
index baf284fd8..eac38acff 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf_regs_NEST.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf_regs_NEST.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_NEST.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # NEST Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Membuf_regs_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule
index 7ea4535d6..b7147c1c2 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Membuf_regs_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Membuf_regs_TP.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Membuf_regs_TP.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # TP Chiplet Registers
@@ -60,6 +60,14 @@
         capture     group default;
     };
 
+    register TP_LFIR_AND
+    {
+        name        "TPTOP.TPC.LOCAL_FIR_AND";
+        scomaddr    0x0104000b;
+        capture     type secondary;
+        capture     group never;
+    };
+
     register TP_LFIR_MASK
     {
         name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_MASK";
@@ -68,6 +76,20 @@
         capture     group default;
     };
 
+    register TP_LFIR_MASK_AND
+    {
+        name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_MASK_AND";
+        scomaddr    0x0104000e;
+        capture     group never;
+    };
+
+    register TP_LFIR_MASK_OR
+    {
+        name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_MASK_OR";
+        scomaddr    0x0104000f;
+        capture     group never;
+    };
+
     register TP_LFIR_ACT0
     {
         name        "TPTOP.TPC.EPS.FIR.LOCAL_FIR_ACTION0";
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
index 39e9a469b..027ab4ce3 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 #
@@ -85,6 +85,14 @@ chip Proc
         capture     group default;
     };
 
+    register GLOBALUNITXSTPFIR
+    {
+        name        "Virtual Global Unit Checkstop FIR";
+        scomaddr    0x51040001;
+        capture     group default;
+        capture     req funccall("CoreConfigured");
+    };
+
 # Import all of the chiplet registers
 .include "Proc_regs_TP.rule"
 .include "Proc_regs_PB.rule"
@@ -92,6 +100,17 @@ chip Proc
 .include "Proc_regs_ABUS.rule"
 .include "Proc_regs_PCIE.rule"
 
+    ############################################################################
+    # Non-FIR Registers
+    ############################################################################
+
+    register TODWOF
+    {
+        name        "Time of Day / WOF Counter";
+        scomaddr    0x00040020;
+        capture     group default;
+    };
+
 };
 
  ##############################################################################
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_acts_ABUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule
index 5f3b423d9..7598b37b7 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_acts_ABUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_acts_ABUS.rule $
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule $
 #
 # IBM CONFIDENTIAL
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_acts_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
index 580bc7c5b..cdcb22d1e 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_acts_PB.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_acts_PB.rule $
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule $
 #
 # IBM CONFIDENTIAL
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_acts_PCIE.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule
index b527c24c0..ebc173ff8 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_acts_PCIE.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_acts_PCIE.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 # PCIE Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_acts_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule
index 5c11eea98..2b4b50559 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_acts_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_acts_TP.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ################################################################################
 # TP Chiplet Registers
@@ -225,6 +225,15 @@ group gTpLFir filter singlebit
      *  Local errors from Trace Array ( error)
      */
     (TpLFir, bit(10|11)) ? TBDDefaultCallout;
+
+    /** TP_LFIR[14]
+     *  local errors from PCB ( error)
+     *
+     *  These should never trigger directly themselves.
+     *  Should be handled by global PRD PLL code.
+     */
+    (TpLFir, bit(14)) ? threshold32pday;
+
 };
 
 ################################################################################
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_acts_XBUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
index d5bb006a0..2b3e7883c 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_acts_XBUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_acts_XBUS.rule $
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule $
 #
 # IBM CONFIDENTIAL
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_regs_ABUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule
index 8a0521daa..0cda7bddc 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_regs_ABUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_regs_ABUS.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_regs_ABUS.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # ABUS Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_regs_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule
index 0e24ce898..c338b137d 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_regs_PB.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_regs_PB.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PB.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # PB Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_regs_PCIE.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule
index 18c4d33ce..a8990ae39 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_regs_PCIE.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_regs_PCIE.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_regs_PCIE.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # PCIE Chiplet Registers
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_regs_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
index 8a1280c70..18d24dc66 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_regs_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_regs_TP.rule $
-# 
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
     ############################################################################
     # TP Chiplet Registers
@@ -75,6 +75,14 @@
         capture     group default;
     };
 
+    register TP_LFIR_AND
+    {
+        name        "EH.TPCHIP.TPC.LOCAL_FIR_AND";
+        scomaddr    0x0104000b;
+        capture     type secondary;
+        capture     group never;
+    };
+
     register TP_LFIR_MASK
     {
         name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_MASK";
@@ -83,6 +91,20 @@
         capture     group default;
     };
 
+    register TP_LFIR_MASK_AND
+    {
+        name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_MASK_AND";
+        scomaddr    0x0104000e;
+        capture     group never;
+    };
+
+    register TP_LFIR_MASK_OR
+    {
+        name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_MASK_OR";
+        scomaddr    0x0104000f;
+        capture     group never;
+    };
+
     register TP_LFIR_ACT0
     {
         name        "EH.TPCHIP.TPC.EPS.FIR.LOCAL_FIR_ACTION0";
diff --git a/src/usr/diag/prdf/plat/pegasus/Proc_regs_XBUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule
index afdb299ea..93e5e52b6 100644..100755
--- a/src/usr/diag/prdf/plat/pegasus/Proc_regs_XBUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule
@@ -1,7 +1,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/plat/pegasus/Proc_regs_XBUS.rule $
+# $Source: src/usr/diag/prdf/common/plat/pegasus/Proc_regs_XBUS.rule $
 #
 # IBM CONFIDENTIAL
 #
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCalloutUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C
index a96039006..23d545e33 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfCalloutUtil.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCalloutUtil.C $            */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCalloutUtil.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H
index 9794239ee..e74c102bc 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfCalloutUtil.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCalloutUtil.H $            */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H $     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMba.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C
index 9739a0b75..f332030a2 100755
--- a/src/usr/diag/prdf/plat/pegasus/prdfCenMba.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCenMba.C $                 */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C $          */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -141,5 +141,28 @@ int32_t MaintCmdComplete( PrdfExtensibleChip * i_mbaChip,
 }
 PRDF_PLUGIN_DEFINE( Mba, MaintCmdComplete );
 
+/**
+ * @brief  Plugin to send a Skip MBA message for Memory Diagnositics.
+ * @note   Does nothing in non-MDIA mode.
+ * @note   Will stop any maintenance commands in progress.
+ * @param  i_chip   mba target
+ * @param  i_sc     The step code data struct.
+ * @return SUCCESS
+ */
+// FIXME: Story 51702 will implement this
+int32_t SkipMbaMsg( PrdfExtensibleChip * i_chip,
+                           STEP_CODE_DATA_STRUCT & i_sc )
+{
+    using namespace TARGETING;
+    int32_t o_rc = SUCCESS;
+    TargetHandle_t mbaTarget = i_chip->GetChipHandle();
+
+    PRDF_ERR("[SkipMbaMsg] MBA 0x%08x : this function is not yet implemented!",
+                 PlatServices::getHuid(mbaTarget));
+
+    return o_rc;
+}
+PRDF_PLUGIN_DEFINE( Mba, SkipMbaMsg );
+
 } // end namespace Mba
 } // end namespace PRDF
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
index 375bd61a4..9fd12de20 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCenMbaDataBundle.H $       */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMembuf.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
index 55d2fb741..8282bf55a 100755
--- a/src/usr/diag/prdf/plat/pegasus/prdfCenMembuf.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfCenMembuf.C $              */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
new file mode 100755
index 000000000..4beda7535
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
@@ -0,0 +1,221 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C $          */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/**
+ * @file prdfCenPLL.C
+ * @brief chip Plug-in code for centaur pll support
+ */
+
+#include <iipServiceDataCollector.h>
+#include <prdfExtensibleChip.H>
+#include <prdfPluginMap.H>
+#include <prdfBitString.H>
+#include <iipscr.h>
+#include <prdfPlatServices.H>
+#include <iipglobl.h>
+#include <iipSystem.h>
+
+namespace PRDF
+{
+
+namespace Membuf
+{
+
+
+enum
+{
+    PLL_DETECT_CENT_MEM  = 18,  // mem PLL error bit
+    PLL_DETECT_CENT_NEST = 19   // nest PLL error bit
+};
+
+/**
+  * @brief Query the PLL chip for a PLL error on Centaur Plugin
+  * @param  i_chip Centaur chip
+  * @param  o_result set to true in the presence of PLL error
+  * @returns Failure or Success of query.
+  * @note
+  */
+int32_t QueryPll( PrdfExtensibleChip * i_chip,
+                        bool & o_result)
+{
+    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");
+
+    do
+    {
+        rc = TP_LFIR->Read();
+        if (rc != SUCCESS) break;
+
+        rc = TP_LFIRmask->Read();
+        if (rc != SUCCESS) break;
+
+        if((TP_LFIR->IsBitSet(PLL_DETECT_CENT_MEM)  &&
+            !(TP_LFIRmask->IsBitSet(PLL_DETECT_CENT_MEM))) ||
+           (TP_LFIR->IsBitSet(PLL_DETECT_CENT_NEST) &&
+            !(TP_LFIRmask->IsBitSet(PLL_DETECT_CENT_NEST))))
+        {
+            o_result = true;
+        }
+
+    } while(0);
+
+    return rc;
+
+}
+PRDF_PLUGIN_DEFINE( Membuf, QueryPll );
+
+/**
+  * @brief Clear the PLL error for Centaur Plugin
+  * @param  i_chip Centaur chip
+  * @param  i_sc   The step code data struct.
+  * @returns Failure or Success of query.
+  * @note
+  */
+int32_t ClearPll( PrdfExtensibleChip * i_chip,
+                        STEP_CODE_DATA_STRUCT & i_sc)
+{
+    int32_t rc = SUCCESS;
+
+    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    {
+        SCAN_COMM_REGISTER_CLASS * TP_LFIR = i_chip->getRegister("TP_LFIR_AND");
+        TP_LFIR->setAllBits();
+        TP_LFIR->ClearBit(PLL_DETECT_CENT_MEM);
+        TP_LFIR->ClearBit(PLL_DETECT_CENT_NEST);
+        rc = TP_LFIR->Write();
+    }
+
+    return rc;
+
+}
+PRDF_PLUGIN_DEFINE( Membuf, ClearPll );
+
+/**
+  * @brief Mask the PLL error for Centaur Plugin
+  * @param  i_chip Centaur chip
+  * @param Output Unused.
+  * @returns Failure or Success of query.
+  * @note
+  */
+int32_t MaskPll( PrdfExtensibleChip * i_chip,void * unused)
+{
+    int32_t rc = SUCCESS;
+
+    SCAN_COMM_REGISTER_CLASS * TP_LFIR = i_chip->getRegister("TP_LFIR");
+    SCAN_COMM_REGISTER_CLASS * TP_LFIR_or = i_chip->getRegister("TP_LFIR_MASK_OR");
+
+    rc = TP_LFIR->Read();
+    TP_LFIR_or->clearAllBits();
+
+    if(TP_LFIR->IsBitSet(PLL_DETECT_CENT_MEM))  TP_LFIR_or->SetBit(PLL_DETECT_CENT_MEM);
+    if(TP_LFIR->IsBitSet(PLL_DETECT_CENT_NEST)) TP_LFIR_or->SetBit(PLL_DETECT_CENT_NEST);
+
+    rc |= TP_LFIR_or->Write();
+
+    return rc;
+
+}
+PRDF_PLUGIN_DEFINE( Membuf, MaskPll );
+
+/**
+ * @brief Adds to the callout list for Centaur PLL errors.
+ * @param  i_chip Centaur chip.
+ * @param  i_sc     The step code data struct.
+ * @return SUCCESS.
+ */
+int32_t CalloutPll( PrdfExtensibleChip * i_chip,
+                    STEP_CODE_DATA_STRUCT & i_sc )
+{
+    // FIXME: RTC: 51628 will address clock target issue
+    // set Level 2 callout since we don't have clock target yet
+    i_sc.service_data->SetCallout( NextLevelSupport_ENUM );
+
+    return SUCCESS;
+}
+PRDF_PLUGIN_DEFINE( Membuf, CalloutPll );
+
+/**
+  Send a PLL error message on Centaur  Plugin.
+  @param i_chip the chip that this is for.
+  @param i_sc service data.
+  @returns Failure Or Success of message call.
+  @note
+   */
+int32_t PllPostAnalysis( PrdfExtensibleChip * i_chip,
+                    STEP_CODE_DATA_STRUCT & i_sc )
+{
+    using namespace TARGETING;
+    int32_t l_rc = SUCCESS;
+
+// Need to send MBA Skip Message to MDIA in Hostboot only
+#ifdef __HOSTBOOT_MODULE
+
+    TargetHandle_t l_cenHandle = i_chip->GetChipHandle();
+
+    do
+    {
+        TargetHandleList list = PlatServices::getConnected(l_cenHandle , TYPE_MBA);
+        if ( 0 == list.size() )
+        {
+            PRDF_ERR("[PllPostAnalysis] failed to get MBAs connected to this "
+                     "Membuf: 0x%08x", PlatServices::getHuid(l_cenHandle) );
+            l_rc = FAIL;
+            break;
+        }
+
+        for (TargetHandleList::iterator mbaIt = list.begin(); mbaIt != list.end(); ++mbaIt)
+        {
+            // Get the extensible chip for this mba
+            PrdfExtensibleChip *l_mbaChip = (PrdfExtensibleChip *)systemPtr->GetChip(*mbaIt);
+
+            //Check to make sure we are at threshold and have something garded.
+            if( (NULL != l_mbaChip) &&
+                (i_sc.service_data->IsAtThreshold()) &&
+                (i_sc.service_data->QueryGard() != GardResolution::NoGard) )
+            {
+                //Call the Skip Maintanence Command on this mba
+                PrdfExtensibleChipFunction * l_skipMbaMsg =
+                    l_mbaChip->getExtensibleFunction("SkipMbaMsg", true);
+
+                // This call will return an error if it doesn't complete.
+                // Don't fail on error.  keep going.
+                l_rc |= (*l_skipMbaMsg)(l_mbaChip,
+                        PrdfPluginDef::bindParm<STEP_CODE_DATA_STRUCT &>(i_sc));
+            }
+        }
+
+    } while(0);
+
+#endif // ifdef __HOSTBOOT_MODULE
+
+    return l_rc;
+}
+PRDF_PLUGIN_DEFINE( Membuf, PllPostAnalysis );
+
+
+} // end namespace Membuf
+
+} // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C b/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C
new file mode 100644
index 000000000..7d5820656
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C
@@ -0,0 +1,449 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C $     */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/** @file prdfDramRepairs.C */
+
+
+#include <prdfMain.H>
+#include <prdf_service_codes.H>
+#include <iipconst.h>
+#include <iipglobl.h>
+#include <prdfEnums.H>
+#include <prdfPlatServices.H>
+#include <prdfMemoryMru.H>
+
+using namespace HWAS;
+using namespace std;
+using namespace TARGETING;
+
+namespace PRDF
+{
+
+static const uint8_t INVALID_SYMBOL = 0xff;
+
+bool validSymbol(uint8_t i_symbol)
+{
+    return i_symbol != INVALID_SYMBOL;
+}
+
+bool commitRestoreCallout(bool (*i_func)(errlHndl_t &, void *), void * i_data)
+{
+    PRDF_DENTER("commitRestoreCallout");
+
+    errlHndl_t err = NULL;
+    bool o_term = false;
+
+    PRDF_HW_CREATE_ERRL(
+            err,
+            ERRL_SEV_PREDICTIVE,
+            ERRL_ETYPE_NOT_APPLICABLE,
+            SRCI_MACH_CHECK,
+            SRCI_NO_ATTR,
+            PRDF_RESTORE_DRAM_REPAIR,
+            FSP_DEFAULT_REFCODE,
+            PRDF_DETECTED_FAIL_HARDWARE_PROBABLE,
+            0, 0, 0, 0, // user data
+            HOM_SYS_NO_TERMINATE,
+            false); // no pld check
+
+    // add the callout
+
+    if((*i_func)(err, i_data))
+    {
+        o_term = true;
+    }
+
+    bool term = false;
+
+    PRDF_HW_COMMIT_ERRL(
+            term,
+            err,
+            HOM_DECONFIG_DEFER,
+            ERRL_ACTION_REPORT,
+            HOM_CONTINUE);
+
+    if(term)
+    {
+        // FIXME...this is a little goofy.
+        // Should be scrubbed with RTC 51552
+
+        PRDF_COMMIT_ERRL(err, ERRL_ACTION_REPORT);
+    }
+
+    return o_term;
+}
+
+bool addMemMruCallout(errlHndl_t & io_log, void * i_memMru)
+{
+    PRDF_DENTER("addMemMruCallout");
+
+    bool o_term = false;
+
+    PRDF_HW_ADD_MEMMRU_CALLOUT(
+            o_term,
+            *static_cast<PrdfMemoryMru *>(i_memMru),
+            SRCI_PRIORITY_HIGH,
+            HOM_DECONFIG,
+            HOM_DECONFIG_GARD,
+            io_log,
+            false, // don't write src to vpd
+            GARD_Predictive,
+            ERRL_SEV_PREDICTIVE,
+            false); // don't update hcdb
+
+    return o_term;
+}
+
+bool addDimmCallout(errlHndl_t & io_log, void * i_dimm)
+{
+    PRDF_DENTER("addDimmCallout");
+
+    bool o_term = false;
+
+    PRDF_HW_ADD_CALLOUT(
+            o_term,
+            static_cast<TargetHandle_t>(i_dimm),
+            SRCI_PRIORITY_HIGH,
+            HOM_DECONFIG,
+            HOM_DECONFIG_GARD,
+            io_log,
+            false, // don't write src to vpd
+            GARD_Predictive,
+            ERRL_SEV_PREDICTIVE,
+            false); // don't update hcdb
+
+    return o_term;
+}
+
+bool processRepairedRanks(
+        TargetHandle_t i_mba,
+        uint8_t i_repairedRankMask)
+{
+    PRDF_DENTER("processRepairedRanks: %p, 0x%02x",
+            i_mba, i_repairedRankMask);
+
+    // check the argument ranks for repairs
+    // that violate RAS policy
+
+    errlHndl_t err = NULL;
+
+    bool calloutMade = false;
+
+    // check each rank for repairs
+    // that violate RAS policy
+
+    for ( uint8_t rankNumber = 0;
+            rankNumber < DIMM_DQ_MAX_MBAPORT_DIMMS * DIMM_DQ_MAX_DIMM_RANKS;
+            ++rankNumber )
+    {
+        if(0 == ((0x80 >> rankNumber) & i_repairedRankMask))
+        {
+            // this rank didn't have any repairs
+
+            continue;
+        }
+
+        uint8_t sm = INVALID_SYMBOL,
+                cm = INVALID_SYMBOL;
+
+        if(SUCCESS != PlatServices::mssGetMarkStore(
+                    i_mba, rankNumber, cm, sm))
+        {
+            // skip this rank
+
+            continue;
+        }
+
+        uint8_t sp0 = INVALID_SYMBOL,
+                sp1 = INVALID_SYMBOL,
+                sp = INVALID_SYMBOL;
+
+        if(SUCCESS != PlatServices::mssGetSteerMux(
+                i_mba,
+                rankNumber,
+                mss_SteerMux::READ_MUX,
+                sp0, sp1, sp))
+        {
+            // skip this rank
+
+            PRDF_COMMIT_ERRL(err, ERRL_ACTION_REPORT);
+            continue;
+        }
+
+        if((validSymbol(sp0) || validSymbol(sp1) || validSymbol(sp))
+                && validSymbol(cm))
+        {
+            // this rank has both a steer
+            // and a chip mark
+
+            // FIXME replace with a real memory mru
+
+            struct GetMemoryMru
+            {
+                PrdfMemoryMru * operator()(
+                        TargetHandle_t i_mba,
+                        uint8_t i_rank,
+                        uint8_t i_symbol)
+                {
+                    return NULL;
+                }
+
+            } getMemoryMru;
+
+            PrdfMemoryMru * memoryMru = getMemoryMru(i_mba, rankNumber, cm);
+
+            commitRestoreCallout(&addMemMruCallout, memoryMru);
+
+            calloutMade = true;
+        }
+    }
+
+    PRDF_DEXIT("processRepairedRanks");
+
+    return calloutMade;
+}
+
+bool processBadDimms(TargetHandle_t i_mba, uint8_t i_badDimmMask)
+{
+    PRDF_DENTER("processBadDimms: %p, 0x%02x", i_mba, i_badDimmMask);
+
+    const struct DimmPortAssoc
+    {
+        uint8_t port;
+        uint8_t dimm;
+        uint8_t enc;
+
+    } dimmPortAssoc[] = {
+
+        {0, 0, 0x8},
+        {0, 1, 0x4},
+        {1, 0, 0x2},
+        {1, 1, 0x1},
+    };
+
+    uint64_t calloutCount = 0;
+
+    // callout the argument dimms
+
+    // get all the dimms connected to this MBA
+
+    TARGETING::TargetHandleList dimms = PlatServices::getConnected(
+            i_mba, TARGETING::TYPE_DIMM);
+
+    // convert the encoded dimms that had too many repairs to
+    // dimm targets
+
+    TargetHandleList::iterator dit = dimms.end();
+
+    while(dit-- != dimms.begin())
+    {
+        uint8_t port = 0, dimm = 0;
+
+        if(SUCCESS != PlatServices::getMbaPort(*dit, port))
+        {
+            // skip this dimm
+            continue;
+        }
+
+        if(SUCCESS != PlatServices::getMbaDimm(*dit, dimm))
+        {
+            // skip this dimm
+            continue;
+        }
+
+        // see if the passed in dimm
+        // was flagged as bad by the restore procedure
+
+        bool match = false;
+
+        const DimmPortAssoc * it = dimmPortAssoc
+            + sizeof(dimmPortAssoc)/sizeof(*dimmPortAssoc);
+
+        while(!match && it-- != dimmPortAssoc)
+        {
+            if(i_badDimmMask & it->enc
+                    && port == it->port
+                    && dimm == it->dimm)
+            {
+                // this dimm is a match
+
+                match = true;
+            }
+        }
+
+        // call them out
+
+        if(match)
+        {
+            ++calloutCount;
+            commitRestoreCallout(&addDimmCallout, *dit);
+        }
+    }
+
+    PRDF_DEXIT("processBadDimms: bad dimm count: %d", calloutCount);
+
+    return 0 != calloutCount;
+}
+
+bool processDq(TargetHandle_t i_mba)
+{
+    PRDF_DENTER("processDq: %p", i_mba);
+
+    // callout any dimms on the argument MBA
+    // that have any bad dq
+
+    uint64_t calloutCount = 0;
+
+    // get all the dimms connected to this MBA
+
+    TARGETING::TargetHandleList dimms = PlatServices::getConnected(
+            i_mba, TARGETING::TYPE_DIMM);
+
+    TargetHandleList::iterator dit = dimms.end();
+
+    // call them out if they have any bad dq
+
+    while(dit-- != dimms.begin())
+    {
+        uint8_t port = 0, dimm = 0;
+
+        if(SUCCESS != PlatServices::getMbaPort(*dit, port))
+        {
+            // skip this dimm
+            continue;
+        }
+
+        if(SUCCESS != PlatServices::getMbaDimm(*dit, dimm))
+        {
+            // skip this dimm
+            continue;
+        }
+
+        bool badDq = false;
+        uint8_t bitmap[DIMM_DQ_RANK_BITMAP_SIZE];
+
+        uint64_t rankNumber = DIMM_DQ_MAX_DIMM_RANKS;
+
+        while(rankNumber-- && !badDq)
+        {
+            if(SUCCESS != PlatServices::getBadDqBitmap(
+                        i_mba,
+                        port,
+                        dimm,
+                        rankNumber,
+                        bitmap))
+            {
+                // skip this rank
+                continue;
+            }
+
+            uint8_t * it = bitmap + DIMM_DQ_RANK_BITMAP_SIZE;
+
+            while(!badDq && it-- != bitmap)
+            {
+                if(*it)
+                {
+                    badDq = true;
+                }
+            }
+        }
+
+        if(badDq)
+        {
+            ++calloutCount;
+            commitRestoreCallout(&addDimmCallout, *dit);
+        }
+    }
+
+    PRDF_DEXIT("processDq: bad dq dimm count: %d", calloutCount);
+
+    return 0 != calloutCount;
+}
+
+int32_t restoreDramRepairs(TargetHandle_t i_mba)
+{
+    bool calloutMade = false;
+
+    PRDF_DENTER("restoreDramRepairs: %p", i_mba);
+
+    uint8_t repairedRankMask = 0, badDimmMask = 0;
+
+    do {
+
+        if(PlatServices::isMemoryPreservingIpl())
+        {
+            // nothing to do in MPIPL
+
+            break;
+        }
+
+        // in mfg mode, check dq and don't restore anything
+
+        if(PlatServices::areDramRepairsDisabled()
+                && processDq(i_mba))
+        {
+            calloutMade = true;
+
+            break;
+        }
+
+        if(SUCCESS != PlatServices::mssRestoreDramRepairs(
+                    i_mba,
+                    repairedRankMask,
+                    badDimmMask))
+        {
+            // can't check anything if
+            // this doesn't work
+
+            PRDF_ERR( "[restoreDramRepairs] "
+                    "PlatServices::mssRestoreDramRepairs failed" );
+
+            break;
+        }
+
+        // callout bad dimms
+
+        if(processBadDimms(
+                    i_mba,
+                    badDimmMask))
+        {
+            calloutMade = true;
+        }
+
+        // check repaired ranks for
+        // RAS policy violations
+
+        if(processRepairedRanks(
+                    i_mba,
+                    repairedRankMask))
+        {
+            calloutMade = true;
+        }
+
+    } while(0);
+
+    PRDF_DEXIT("restoreDramRepairs");
+
+    return calloutMade ? FAIL : SUCCESS;
+}
+}
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfMemUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C
index db09b8d72..46f3486f0 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfMemUtil.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfMemUtil.C $                */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfMemUtil.H b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H
index edf638eab..03b25ce95 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfMemUtil.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfMemUtil.H $                */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfP8Mcs.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C
index d62412466..a43ae8ea6 100755
--- a/src/usr/diag/prdf/plat/pegasus/prdfP8Mcs.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfP8Mcs.C $                  */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C $           */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
new file mode 100755
index 000000000..b89cae099
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
@@ -0,0 +1,150 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C $           */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/**
+ * @file prdfP8PLL.C
+ * @brief chip Plug-in code for proc pll support
+ */
+
+#include <iipServiceDataCollector.h>
+#include <prdfExtensibleChip.H>
+#include <prdfPluginMap.H>
+#include <prdfBitString.H>
+#include <iipscr.h>
+#include <prdfPlatServices.H>
+
+namespace PRDF
+{
+
+namespace Proc
+{
+
+
+enum
+{
+    PLL_DETECT_P8 = 14,  //Bit position of the error bit.
+};
+
+/**
+  * @brief Query the PLL chip for a PLL error on P8 Plugin
+  * @param  i_chip P8 chip
+  * @param o_result set to true in the presence of PLL error
+  * @returns Failure or Success of query.
+  * @note
+  */
+int32_t QueryPll( PrdfExtensibleChip * i_chip,
+                        bool & o_result)
+{
+    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");
+
+    do
+    {
+        rc = TP_LFIR->Read();
+        if (rc != SUCCESS) break;
+
+        rc = TP_LFIRmask->Read();
+        if (rc != SUCCESS) break;
+
+        if(TP_LFIR->IsBitSet(PLL_DETECT_P8) &&
+           !(TP_LFIRmask->IsBitSet(PLL_DETECT_P8)))
+        {
+            o_result = true;
+        }
+
+    } while(0);
+
+    return rc;
+
+}
+PRDF_PLUGIN_DEFINE( Proc, QueryPll );
+
+/**
+  * @brief Clear the PLL error for P8 Plugin
+  * @param  i_chip P8 chip
+  * @param  i_sc   The step code data struct
+  * @returns Failure or Success of query.
+  * @note
+  */
+int32_t ClearPll( PrdfExtensibleChip * i_chip,
+                        STEP_CODE_DATA_STRUCT & i_sc)
+{
+    int32_t rc = SUCCESS;
+
+    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    {
+        SCAN_COMM_REGISTER_CLASS * TP_LFIR = i_chip->getRegister("TP_LFIR_AND");
+        TP_LFIR->setAllBits();
+        TP_LFIR->ClearBit(PLL_DETECT_P8);
+        rc = TP_LFIR->Write();
+    }
+
+    return rc;
+
+}
+PRDF_PLUGIN_DEFINE( Proc, ClearPll );
+
+/**
+  * @brief Mask the PLL error for P8 Plugin
+  * @param  i_chip P8 chip
+  * @param Output Unused.
+  * @returns Failure or Success of query.
+  * @note
+  */
+int32_t MaskPll( PrdfExtensibleChip * i_chip,void * unused)
+{
+    int32_t rc = SUCCESS;
+    SCAN_COMM_REGISTER_CLASS * tpmask_or = i_chip->getRegister("TP_LFIR_MASK_OR");
+    tpmask_or->clearAllBits();
+    tpmask_or->SetBit(PLL_DETECT_P8);
+    rc = tpmask_or->Write();
+    return rc;
+
+}
+PRDF_PLUGIN_DEFINE( Proc, MaskPll );
+
+/**
+ * @brief Adds to the callout list for P8 PLL errors.
+ * @param  i_chip P8 chip.
+ * @param  i_sc     The step code data struct.
+ * @return SUCCESS.
+ */
+int32_t CalloutPll( PrdfExtensibleChip * i_chip,
+                    STEP_CODE_DATA_STRUCT & i_sc )
+{
+    // FIXME: RTC: 51628 will address clock target issue
+    // set Level 2 callout since we don't have clock target yet
+    i_sc.service_data->SetCallout( NextLevelSupport_ENUM );
+
+    return SUCCESS;
+
+}
+PRDF_PLUGIN_DEFINE( Proc, CalloutPll );
+
+
+} // end namespace Proc
+
+} // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
new file mode 100755
index 000000000..961b1785a
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -0,0 +1,362 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C $          */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/** @file  prdfP8Proc.C
+ *  @brief Contains all the plugin code for the PRD P8 Proc
+ */
+#include <prdfPluginDef.H>
+#include <iipServiceDataCollector.h>
+#include <prdfExtensibleChip.H>
+#include <prdfPlatServices.H>
+#include <prdfPluginMap.H>
+
+namespace PRDF
+{
+namespace Proc
+{
+
+//##############################################################################
+//
+//                             Special plugins
+//
+//##############################################################################
+
+/**
+ * @brief  Plugin that initializes the P8 Mba data bundle.
+ * @param  i_chip P8 chip.
+ * @return SUCCESS
+ */
+int32_t Initialize( PrdfExtensibleChip * i_chip )
+{
+    // FIXME: Add proper initialization as per requirement
+    return SUCCESS;
+}
+PRDF_PLUGIN_DEFINE( Proc, Initialize );
+
+/**
+ * @brief Checks the Global Broadcast register.
+ * @param i_reg - the global recoverable register
+ * @param i_tpReg - the TP chiplet recoverable register
+ * @return true if only MC bits are on.
+ */
+static inline bool OnlyMcRec (SCAN_COMM_REGISTER_CLASS * i_reg,
+                              SCAN_COMM_REGISTER_CLASS * i_tpReg)
+{
+    bool rc = false;
+
+    if ( (0 == i_reg->GetBitFieldJustified(2,23)) &&
+         (0 == i_tpReg->GetBitFieldJustified(1,2)) &&
+         (0 != i_tpReg->GetBitFieldJustified(3,8)) &&
+         (0 == i_tpReg->GetBitFieldJustified(11,8)) )
+    {
+        rc = true;
+    }
+    return rc;
+}
+
+/**
+ * @brief Checks the GLobal CS Brodacast register and
+ *        the PBXSTP Chiplet register
+ * @param i_glcs - the Global CS Broadcast register
+ * @param i_tpcs - the TPXSTP register
+ * @param i_pbcs - the PBXSTP register
+ * @return true if only mem bits are on in CS, or,
+ *         if the only other CS is External CS.
+ */
+static inline bool OnlyMcOrExtCS (SCAN_COMM_REGISTER_CLASS * i_glcs,
+                                  SCAN_COMM_REGISTER_CLASS * i_tpCs,
+                                  SCAN_COMM_REGISTER_CLASS * i_pbcs)
+{
+    bool rc = false;
+
+    if (((0 == i_glcs->GetBitFieldJustified(3,22)) && //No CS besides TP and PB
+         (0 == i_tpCs->GetBitFieldJustified(3,2 )) && //No CS in TP besides MCs
+         (0 == i_tpCs->GetBitFieldJustified(13,8)))   //No CS in TP besides MCs
+        &&                                            //and
+        (((!i_glcs->IsBitSet(2)) &&                   // if its not from PB
+          (0 != i_tpCs->GetBitFieldJustified(5,8)))   // and it is from a MC
+         ||                                           //   or
+         ((i_glcs->IsBitSet(2)) &&                    // it is from PB
+          (i_pbcs->IsBitSet(2)) &&                    // and its external
+          (0 == i_pbcs->GetBitFieldJustified(3,18)))))// and nothing else in PB
+    {
+        rc = true;
+    }
+
+    return rc;
+}
+
+/**
+ * @brief Used when the chip has a CHECK_STOP attention to check for the
+ * presence of recovered errors.
+ * @param  i_chip - P8 chip.
+ * @param o_hasRecovered - true if chip has a recovered that we want to analyze
+ * @return SUCCESS
+ */
+int32_t CheckForRecovered(PrdfExtensibleChip * i_chip,
+                          bool & o_hasRecovered)
+{
+    o_hasRecovered = false;
+    int32_t o_rc = SUCCESS;
+
+    SCAN_COMM_REGISTER_CLASS * l_rer =
+      i_chip->getRegister("GLOBAL_RE_FIR");
+    o_rc |= l_rer->Read();
+
+    SCAN_COMM_REGISTER_CLASS * l_TPrer =
+      i_chip->getRegister("TP_CHIPLET_RE_FIR");
+    o_rc |= l_TPrer->Read();
+
+    SCAN_COMM_REGISTER_CLASS * l_TPxstp =
+      i_chip->getRegister("TP_CHIPLET_CS_FIR");
+    o_rc |= l_TPxstp->Read();
+
+    SCAN_COMM_REGISTER_CLASS * l_xstop =
+      i_chip->getRegister("GLOBAL_CS_FIR");
+    o_rc |= l_xstop->Read();
+
+    SCAN_COMM_REGISTER_CLASS * l_pbXstpFir =
+      i_chip->getRegister("PB_CHIPLET_CS_FIR");
+    o_rc |= l_pbXstpFir->Read();
+
+    if (o_rc)
+    {
+        PRDF_ERR( "[CheckForRecovered] SCOM fail on 0x%08x rc=%x",
+                  i_chip->GetId(), o_rc);
+        return o_rc;
+    }
+
+    if ( 0 != l_rer->GetBitFieldJustified(0,32) )
+    {
+        if ( 0 == l_TPrer->GetBitFieldJustified(3,8) )
+        { //No MC Recov
+            o_hasRecovered = true;
+        }
+        else if ( 0 != l_TPxstp->GetBitFieldJustified(5,8) )
+        {
+            // There is Mc Recov and Mc xstop
+            if ( OnlyMcRec(l_rer, l_TPrer) &&
+                 OnlyMcOrExtCS(l_xstop, l_TPxstp, l_pbXstpFir) )
+            {
+                // Ignore the Mc Recoverable if only the Mc bits are
+                // on in Global Recoverable reg, and, either the only
+                // Global CS bits are Mc or there is an External CS.
+            }
+            else
+            {
+                o_hasRecovered = true;
+            }
+        }
+        else
+        {
+            // MC Recov does not match MC Xstop
+              o_hasRecovered = true;
+        }
+    }
+
+    return SUCCESS;
+} PRDF_PLUGIN_DEFINE( Proc, CheckForRecovered );
+
+//------------------------------------------------------------------------------
+/**
+ * @brief Used when the chip is queried, by the fabric domain, for RECOVERED
+ * attentions to assign a severity to the attention for sorting.
+ * @param[in]   i_chip - P8 chip
+ * @param[out]  o_sev - Priority order (lowest to highest):
+ *  1 - Core chiplet checkstop
+ *  2 - Core chiplet error
+ *  3 - PCB chiplet error (TOD logic)
+ *  4 - Other error
+ *  5 - Memory controller chiplet
+ *
+ * @return SUCCESS
+ *
+ */
+int32_t CheckForRecoveredSev(PrdfExtensibleChip * i_chip,
+                             uint32_t & o_sev)
+{
+    SCAN_COMM_REGISTER_CLASS * l_rer = NULL;
+    SCAN_COMM_REGISTER_CLASS * l_TPrer = NULL;
+    SCAN_COMM_REGISTER_CLASS * l_unitxstp = NULL;
+
+    int32_t o_rc = SUCCESS;
+
+    l_unitxstp = i_chip->getRegister("GLOBALUNITXSTPFIR");
+    o_rc |= l_unitxstp->Read();
+    l_rer = i_chip->getRegister("GLOBAL_RE_FIR");
+    o_rc |= l_rer->Read();
+    l_TPrer = i_chip->getRegister("TP_CHIPLET_RE_FIR");
+    o_rc |= l_TPrer->Read();
+
+    if (o_rc)
+    {
+        PRDF_ERR( "[CheckForRecoveredSev] SCOM fail on 0x%08x rc=%x",
+                  i_chip->GetId(), o_rc);
+        return o_rc;
+    }
+
+    if (l_TPrer->GetBitFieldJustified(3,8) != 0)
+    {
+        // errors from MCS chiplets
+        o_sev = 5;
+    }
+    else if(l_rer->IsBitSet(2) || l_rer->IsBitSet(4) || l_rer->IsBitSet(8))
+    {
+        // errors from PB, X, or A bus chiplets
+        o_sev = 4;
+    }
+    else if(l_rer->IsBitSet(1))
+    {
+        // error from TP (other than MCS chiplets)
+        o_sev = 3;
+    }
+    else if((l_rer->GetBitFieldJustified(11,14) &
+             l_unitxstp->GetBitFieldJustified(11,14)) == 0)
+    {
+        // core recoverable
+        o_sev = 2;
+    }
+    else
+    {
+        // core checkstop
+        o_sev = 1;
+    }
+
+    return SUCCESS;
+
+} PRDF_PLUGIN_DEFINE( Proc, CheckForRecoveredSev );
+
+/** @func GetCheckstopInfo
+ *  To be called from the fabric domain to gather Checkstop information.  This
+ *  information is used in a sorting algorithm.
+ *
+ *  This is a plugin function: GetCheckstopInfo
+ *
+ *  @param i_chip - The chip.
+ *  @param o_wasInternal - True if this chip has an internal checkstop.
+ *  @param o_externalChips - List of external fabrics driving checkstop.
+ *  @param o_wofValue - Current WOF value (unused for now).
+ */
+int32_t GetCheckstopInfo(PrdfExtensibleChip * i_chip,
+                   bool & o_wasInternal,
+                   TARGETING::TargetHandleList & o_externalChips,
+                   uint64_t & o_wofValue)
+{
+    using namespace TARGETING; using namespace PlatServices;
+
+    // Clear parameters.
+    o_wasInternal = false;
+    o_externalChips.erase(o_externalChips.begin(), o_externalChips.end());
+    o_wofValue = 0;
+
+    SCAN_COMM_REGISTER_CLASS * l_globalFir =
+      i_chip->getRegister("GLOBAL_CS_FIR");
+
+    SCAN_COMM_REGISTER_CLASS * l_pbXstpFir =
+      i_chip->getRegister("PB_CHIPLET_CS_FIR");
+
+    SCAN_COMM_REGISTER_CLASS * l_extXstpFir =
+      i_chip->getRegister("PBEXTFIR");
+
+    int32_t o_rc = SUCCESS;
+    o_rc |= l_globalFir->Read();
+    o_rc |= l_pbXstpFir->Read();
+    o_rc |= l_extXstpFir->Read();
+
+    if(o_rc)
+    {
+        PRDF_ERR( "[GetCheckstopInfo] SCOM fail on 0x%08x rc=%x",
+                  i_chip->GetId(), o_rc);
+        return o_rc;
+    }
+
+    if ((0 != l_globalFir->GetBitFieldJustified(0,32)) &&
+        (!l_globalFir->IsBitSet(2) ||
+         !l_pbXstpFir->IsBitSet(2)))
+        o_wasInternal = true;
+
+    // Get connected chips.
+    uint32_t l_connectedXstps = l_extXstpFir->GetBitFieldJustified(0,7);
+    uint32_t l_positions[] =
+    {
+        0, // bit 0 - XBUS 0
+        1, // bit 1 - XBUS 1
+        2, // bit 2 - XBUS 2
+        3, // bit 3 - XBUS 3
+        0, // bit 4 - ABUS 0
+        1, // bit 5 - ABUS 1
+        2  // bit 6 - ABUS 2
+    };
+
+    for (int i = 0, j = 0x40; i < 7; i++, j >>= 1)
+    {
+        if (0 != (j & l_connectedXstps))
+        {
+            TargetHandle_t l_connectedFab =
+              getConnectedPeerProc(i_chip->GetChipHandle(),
+                                   i<4 ? TYPE_XBUS : TYPE_ABUS,
+                                   l_positions[i]);
+
+            if (NULL != l_connectedFab)
+            {
+                o_externalChips.push_back(l_connectedFab);
+            }
+        }
+    }
+
+    // Read WOF value.
+    SCAN_COMM_REGISTER_CLASS * l_wof = i_chip->getRegister("TODWOF");
+    o_rc |= l_wof->Read();
+
+    if(o_rc)
+    {
+        PRDF_ERR( "[GetCheckstopInfo] SCOM fail on 0x%08x rc=%x",
+                  i_chip->GetId(), o_rc);
+        return o_rc;
+    }
+
+    o_wofValue = (((uint64_t)l_wof->GetBitFieldJustified(0,32)) << 32) |
+      ((uint64_t)l_wof->GetBitFieldJustified(32,32));
+
+    return SUCCESS;
+
+} PRDF_PLUGIN_DEFINE( Proc, GetCheckstopInfo );
+
+int32_t CoreConfigured(PrdfExtensibleChip * i_chip,
+                       bool & o_isCoreConfigured)
+{
+    using namespace TARGETING;
+
+    o_isCoreConfigured = false;
+
+    TargetHandleList l_coreList =
+      PlatServices::getConnected(i_chip->GetChipHandle(), TYPE_EX);
+
+    if (l_coreList.size() > 0)
+        o_isCoreConfigured = true;
+
+    return SUCCESS;
+} PRDF_PLUGIN_DEFINE(Proc, CoreConfigured);
+
+} // end namespace Proc
+} // end namespace PRDF
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfP8SystemSpecific.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
index 074ddd3e6..090770545 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfP8SystemSpecific.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfP8SystemSpecific.C $       */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -31,9 +31,9 @@
 
 namespace PrdfSystemSpecific
 {
-    Configurator * getConfiguratorPtr()
+    PRDF::Configurator * getConfiguratorPtr()
     {
-        return new PrdfPegasusConfigurator;
+        return new PRDF::PegasusConfigurator;
     }
 
     void postAnalysisWorkarounds(STEP_CODE_DATA_STRUCT & i_sdc)
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPegasusConfigurator.C b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C
index db5986adf..ea0fb5dd3 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfPegasusConfigurator.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfPegasusConfigurator.C $    */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -43,18 +43,61 @@
 #include <iipSystem.h>
 #include <prdrLoadChipCache.H>  // To flush chip-file cache.
 
+namespace PRDF
+{
+
 //------------------------------------------------------------------------------
 
 // Resolution for no chips at attention.
-CallAttnResolution PrdfPegasusConfigurator::noAttnResolution;
+CallAttnResolution PegasusConfigurator::noAttnResolution;
 
 //------------------------------------------------------------------------------
+// Local Helper functions
+
+/**
+ * @brief Return max number of nodes in the system
+ *        Note that Hostboot only has node view.
+ * @return max number of nodes
+ *         always return 1 in Hostboot
+ */
+uint32_t _getMaxNumNodes()
+{
+    #ifdef __HOSTBOOT_MODULE
+        return 1; // only one node in Hostboot
+    #else
+        return MAX_NODE_PER_SYS;
+    #endif
+}
 
-System * PrdfPegasusConfigurator::build()
+/**
+ * @brief   Returns the position of a node in which the given target is
+ *          contained.
+ * @param   i_target Any target.
+ * @return  The position of the connected node.
+ *          Hostboot only has node view so it always returns 0.
+ */
+uint32_t _getNodePosition( TARGETING::TargetHandle_t i_pTarget )
 {
     using namespace TARGETING;
 
-    PRDF_ENTER( "PrdfPegasusConfigurator::build()" );
+    uint32_t o_pos = 0;
+
+    #ifndef __HOSTBOOT_MODULE
+
+    o_pos = PlatServices::getNodePosition(i_pTarget);
+
+    #endif
+
+    return o_pos;
+}
+
+//------------------------------------------------------------------------------
+
+System * PegasusConfigurator::build()
+{
+    using namespace TARGETING;
+
+    PRDF_ENTER( "PegasusConfigurator::build()" );
 
     // Create System object to populate with domains.
     System * l_system = new System(noAttnResolution);
@@ -66,13 +109,22 @@ System * PrdfPegasusConfigurator::build()
     PrdfMembufDomain * l_membufDomain = new PrdfMembufDomain( MEMBUF_DOMAIN );
     PrdfMbaDomain    * l_mbaDomain    = new PrdfMbaDomain(    MBA_DOMAIN    );
 
+    uint32_t l_maxNodeCount = _getMaxNumNodes();
+
+    // PLL domains
+    PllDomainList l_fabricPllDomains(l_maxNodeCount, NULL);
+    PllDomainList l_membPllDomains(  l_maxNodeCount, NULL);
+
     // Add chips to domains.
-    addDomainChips( TYPE_PROC,   l_procDomain   );
+    addDomainChips( TYPE_PROC,   l_procDomain,   &l_fabricPllDomains );
     addDomainChips( TYPE_EX,     l_exDomain     );
     addDomainChips( TYPE_MCS,    l_mcsDomain    );
-    addDomainChips( TYPE_MEMBUF, l_membufDomain );
+    addDomainChips( TYPE_MEMBUF, l_membufDomain, &l_membPllDomains );
     addDomainChips( TYPE_MBA,    l_mbaDomain    );
 
+    // Add Pll domains to domain list.
+    addPllDomainsToSystem( l_fabricPllDomains, l_membPllDomains );
+
     // Add domains to domain list. NOTE: Order is important because this is the
     // order the domains will be analyzed.
     sysDmnLst.push_back( l_procDomain   );
@@ -89,18 +141,18 @@ System * PrdfPegasusConfigurator::build()
     Configurator::domainList & domains = getDomainList();
     l_system->AddDomains( domains.begin(), domains.end() );
 
-    PRDF_EXIT( "PrdfPegasusConfigurator::build()" );
+    PRDF_EXIT( "PegasusConfigurator::build()" );
 
     return l_system;
 }
 
 //------------------------------------------------------------------------------
 
-void PrdfPegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
-                                              PrdfRuleChipDomain * io_domain )
+void PegasusConfigurator::addDomainChips( TARGETING::TYPE      i_type,
+                                          PrdfRuleChipDomain * io_domain,
+                                          PllDomainList      * io_pllDomains )
 {
     using namespace TARGETING;
-    using namespace PRDF;
 
     int32_t l_rc = SUCCESS;
 
@@ -126,30 +178,6 @@ void PrdfPegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
 
     if ( SUCCESS == l_rc )
     {
-        /*
-        // Test code to vary the size of the target config
-        // so we can still run one simic system type but
-        // get different configs for memory measurements
-
-        uint32_t PROC_LIMIT = 16; // set to no limit for now
-        uint32_t MEMBUF_PER_PROC_LIMIT = 4;
-        uint32_t CONFIG_LIMIT = 0;
-        uint32_t count = 0;
-        switch ( i_type )
-        {
-            case TYPE_PROC:   CONFIG_LIMIT = PROC_LIMIT;   break;
-            case TYPE_EX:     CONFIG_LIMIT = 6 * PROC_LIMIT;   break;
-            case TYPE_ABUS:   CONFIG_LIMIT = 3 * PROC_LIMIT;   break;
-            case TYPE_XBUS:   CONFIG_LIMIT = 4 * PROC_LIMIT;   break;
-            case TYPE_MCS:    CONFIG_LIMIT = MEMBUF_PER_PROC_LIMIT * PROC_LIMIT;   break;
-            case TYPE_MEMBUF: CONFIG_LIMIT = MEMBUF_PER_PROC_LIMIT * PROC_LIMIT;   break;
-            case TYPE_MBA:    CONFIG_LIMIT = 2 * MEMBUF_PER_PROC_LIMIT * PROC_LIMIT;   break;
-
-            default: break;
-        }
-        //end Test code
-        */
-
         // Get all targets of specified type and add to given domain.
         TargetHandleList list = PlatServices::getFunctionalTargetList( i_type );
         for ( TargetHandleList::const_iterator itr = list.begin();
@@ -157,20 +185,33 @@ void PrdfPegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
         {
             if ( NULL == *itr ) continue;
 
-            // Test code to vary the target config
-            //if(count < CONFIG_LIMIT)
-            //{
-
-//            PRDF_TRAC( "[addDomainChips] build rule chip target: 0x%08x",
-//                       PlatServices::getHuid(*itr) );
-
             PrdfRuleChip * chip = new PrdfRuleChip( fileName, *itr,
                                                     scanFac, resFac );
             sysChipLst.push_back( chip );
             io_domain->AddChip(   chip );
 
-            //}
-            //count++;
+            // PLL domains
+            switch ( i_type )
+            {
+                case TYPE_PROC:
+                    addChipsToPllDomain(CLOCK_DOMAIN_FAB,
+                                        io_pllDomains,
+                                        chip,
+                                        *itr,
+                                        scanFac,
+                                        resFac);
+                    break;
+                case TYPE_MEMBUF:
+                    addChipsToPllDomain(CLOCK_DOMAIN_MEMBUF,
+                                        io_pllDomains,
+                                        chip,
+                                        *itr,
+                                        scanFac,
+                                        resFac);
+                    break;
+                default:
+                    break;
+            }
         }
 
         // Flush rule table cache since objects are all built.
@@ -179,3 +220,79 @@ void PrdfPegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
     }
 }
 
+void PegasusConfigurator::addChipsToPllDomain(
+ DOMAIN_ID                    i_domainId,
+ PllDomainList              * io_pllDomains,
+ PrdfRuleChip               * i_chip,
+ TARGETING::TargetHandle_t    i_pTarget,
+ ScanFacility               & i_scanFac,
+ ResolutionFactory          & i_resFac)
+{
+    using namespace TARGETING;
+
+    do
+    {
+        uint32_t l_node = _getNodePosition(i_pTarget);
+
+        // Fabric PLL - only one per node as all fabs on node have same clock source
+        if(NULL != io_pllDomains)
+        {
+            if(NULL == (*io_pllDomains)[l_node])
+            {
+                if((CLOCK_DOMAIN_FAB    == i_domainId) ||
+                   (CLOCK_DOMAIN_MEMBUF == i_domainId))
+                {
+                    Resolution & l_clock =(CLOCK_DOMAIN_FAB == i_domainId) ?
+                        i_resFac.GetClockResolution(i_pTarget, TYPE_PROC) :
+                        i_resFac.GetClockResolution(i_pTarget, TYPE_MEMBUF);
+
+                    #ifdef __HOSTBOOT_MODULE
+                    (*io_pllDomains)[l_node] = new PllDomain(
+                                        i_domainId, l_clock,
+                                        ThresholdResolution::cv_pllDefault );
+                    #else
+                    (*io_pllDomains)[l_node] = new PllDomain(
+                                        i_domainId, l_clock, CONTENT_HW,
+                                        ThresholdResolution::cv_pllDefault );
+                    #endif
+                }
+                else
+                {
+                    PRDF_ERR( "[addChipsToPllDomain] Unsupported PLL Domain: "
+                              "0x%08x", i_domainId );
+                    break;
+                }
+            }
+
+            (*io_pllDomains)[l_node]->AddChip(i_chip);
+        }
+
+    } while(0);
+}
+
+void PegasusConfigurator::addPllDomainsToSystem(
+       PllDomainList  & i_fabricPllDomains,
+       PllDomainList  & i_membPllDomains)
+{
+    uint32_t l_maxNodeCount = _getMaxNumNodes();
+
+    //Add Fabric Pll Domains to the system.
+    for(uint32_t n = 0; n < l_maxNodeCount; ++n)
+    {
+        if(NULL != i_fabricPllDomains[n])
+        {
+            sysDmnLst.push_back(i_fabricPllDomains[n]);
+        }
+    }
+
+    //Add Membuf Pll Domains to the system.
+    for(uint32_t n = 0; n < l_maxNodeCount; ++n)
+    {
+        if(NULL != i_membPllDomains[n])
+        {
+            sysDmnLst.push_back(i_membPllDomains[n]);
+        }
+    }
+}
+
+} // End namespace PRDF
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPegasusConfigurator.H b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H
index 8e638e64d..4d442993b 100644
--- a/src/usr/diag/prdf/plat/pegasus/prdfPegasusConfigurator.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfPegasusConfigurator.H $    */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -30,17 +30,25 @@
 
 #include <iipConfigurator.h>
 #include <iipCallAttnResolution.h> // For CallAttnResolution
-#include <prdfRuleChipDomain.H>
+#include <prdfPllDomain.H>
+
+class PrdfRuleChipDomain;
+
+namespace PRDF
+{
+
+typedef std::vector< PRDF::PllDomain  *> PllDomainList;
+typedef std::vector< CHIP_CLASS *> PllChipList;
 
 /** @brief PRD configurator for Pegasus (P8 systems) */
-class PrdfPegasusConfigurator : public Configurator
+class PegasusConfigurator : public Configurator
 {
   public:
 
     /**
      * @brief Constructor
      */
-    PrdfPegasusConfigurator() :
+    PegasusConfigurator() :
         Configurator( PrdfRuleChipDomain::TOTAL_CHIPS,
                       PrdfRuleChipDomain::TOTAL_DOMAINS )
     {}
@@ -50,7 +58,7 @@ class PrdfPegasusConfigurator : public Configurator
      * @note  This configurator does not delete the objects it created during
      *        build(); that is the responsibility of the system object.
      */
-    ~PrdfPegasusConfigurator() {}
+    ~PegasusConfigurator() {}
 
     /**
      * @brief  Create the PRD system object, all chip instances, and all domain
@@ -64,18 +72,46 @@ class PrdfPegasusConfigurator : public Configurator
   private: // functions
 
     /** @brief Copy not allowed. */
-    PrdfPegasusConfigurator( const PrdfPegasusConfigurator & right );
+    PegasusConfigurator( const PegasusConfigurator & right );
 
     /** @brief Assignment not allowed. */
-    const PrdfPegasusConfigurator & operator=( const PrdfPegasusConfigurator & right );
+    const PegasusConfigurator & operator=( const PegasusConfigurator & right );
 
     /**
      * @brief Will add all chips of a given type to a domain.
      * @parm  i_type    The specified target type.
      * @parm  io_domain The associated domain.
+     * @parm  io_pllDomains The associated PLL domain (optional for some)
      */
     void addDomainChips( TARGETING::TYPE i_type,
-                         PrdfRuleChipDomain * io_domain );
+                         PrdfRuleChipDomain * io_domain,
+                         PllDomainList      * io_pllDomains = NULL );
+
+    /**
+     *  @brief  Add chip to its Pll Domain.
+     *  @param i_domainId          - Domain Id (CLOCK_DOMAIN_FAB/_MEMBUF)
+     *  @param i_fabricPllDomains  - List of Pll Domains
+     *  @param i_chip              - Pointer to chip.
+     *  @param i_pTarget           - chip target.
+     *  @param i_scanFac           - Scan Facility.
+     *  @param i_resFac            - Resolution Factory.
+     */
+    void addChipsToPllDomain(
+         DOMAIN_ID                    i_domainId,
+         PllDomainList              * io_fabricPllDomains,
+         PrdfRuleChip               * i_chip,
+         TARGETING::TargetHandle_t    i_pTarget,
+         ScanFacility               & i_scanFac,
+         ResolutionFactory          & i_resFac);
+
+  /**
+   *  @brief Add Pll Domains to the System.
+   *  @param i_fabricPllDomains  - List of Fabric Pll Domains
+   *  @param i_membPllDomains    - List of Membuf Pll Domains
+   */
+  void addPllDomainsToSystem(
+        PllDomainList  & i_fabricPllDomains,
+        PllDomainList  & i_membPllDomains);
 
   private: // data
 
@@ -83,4 +119,6 @@ class PrdfPegasusConfigurator : public Configurator
 
 };
 
+} // End namespace PRDF
+
 #endif
diff --git a/src/usr/diag/prdf/plat/prdfL3Table.C b/src/usr/diag/prdf/common/plat/prdfL3Table.C
index b10deca9a..5bacecb2b 100755
--- a/src/usr/diag/prdf/plat/prdfL3Table.C
+++ b/src/usr/diag/prdf/common/plat/prdfL3Table.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfL3Table.C $                        */
+/* $Source: src/usr/diag/prdf/common/plat/prdfL3Table.C $                 */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfL3Table.H b/src/usr/diag/prdf/common/plat/prdfL3Table.H
index 28157a3e7..6414f82b5 100755
--- a/src/usr/diag/prdf/plat/prdfL3Table.H
+++ b/src/usr/diag/prdf/common/plat/prdfL3Table.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfL3Table.H $                        */
+/* $Source: src/usr/diag/prdf/common/plat/prdfL3Table.H $                 */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfLineDelete.C b/src/usr/diag/prdf/common/plat/prdfLineDelete.C
index 9f866c74c..a3f669918 100755
--- a/src/usr/diag/prdf/plat/prdfLineDelete.C
+++ b/src/usr/diag/prdf/common/plat/prdfLineDelete.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfLineDelete.C $                     */
+/* $Source: src/usr/diag/prdf/common/plat/prdfLineDelete.C $              */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfLineDelete.H b/src/usr/diag/prdf/common/plat/prdfLineDelete.H
index 09efa6a97..8c7d3c80c 100755
--- a/src/usr/diag/prdf/plat/prdfLineDelete.H
+++ b/src/usr/diag/prdf/common/plat/prdfLineDelete.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfLineDelete.H $                     */
+/* $Source: src/usr/diag/prdf/common/plat/prdfLineDelete.H $              */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfMemoryMru.C b/src/usr/diag/prdf/common/plat/prdfMemoryMru.C
index 01f112717..092f1832c 100755
--- a/src/usr/diag/prdf/plat/prdfMemoryMru.C
+++ b/src/usr/diag/prdf/common/plat/prdfMemoryMru.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfMemoryMru.C $                      */
+/* $Source: src/usr/diag/prdf/common/plat/prdfMemoryMru.C $               */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfMemoryMru.H b/src/usr/diag/prdf/common/plat/prdfMemoryMru.H
index 6043a152c..c501e0939 100755
--- a/src/usr/diag/prdf/plat/prdfMemoryMru.H
+++ b/src/usr/diag/prdf/common/plat/prdfMemoryMru.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfMemoryMru.H $                      */
+/* $Source: src/usr/diag/prdf/common/plat/prdfMemoryMru.H $               */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfRepairHealth.C b/src/usr/diag/prdf/common/plat/prdfRepairHealth.C
index 7fc2165c2..11d244701 100755
--- a/src/usr/diag/prdf/plat/prdfRepairHealth.C
+++ b/src/usr/diag/prdf/common/plat/prdfRepairHealth.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfRepairHealth.C $                   */
+/* $Source: src/usr/diag/prdf/common/plat/prdfRepairHealth.C $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfRepairHealth.H b/src/usr/diag/prdf/common/plat/prdfRepairHealth.H
index ff2b10354..4c3bee42c 100755
--- a/src/usr/diag/prdf/plat/prdfRepairHealth.H
+++ b/src/usr/diag/prdf/common/plat/prdfRepairHealth.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfRepairHealth.H $                   */
+/* $Source: src/usr/diag/prdf/common/plat/prdfRepairHealth.H $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/plat/prdfTOD.H b/src/usr/diag/prdf/common/plat/prdfTOD.H
index 572656fa1..de1875d5b 100755
--- a/src/usr/diag/prdf/plat/prdfTOD.H
+++ b/src/usr/diag/prdf/common/plat/prdfTOD.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/prdfTOD.H $                            */
+/* $Source: src/usr/diag/prdf/common/plat/prdfTOD.H $                     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/prd_framework.mk b/src/usr/diag/prdf/common/prd_framework.mk
index 8aa11ae2d..efc224024 100755
--- a/src/usr/diag/prdf/prd_framework.mk
+++ b/src/usr/diag/prdf/common/prd_framework.mk
@@ -1,31 +1,39 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/prd_framework.mk $
-# 
+#
+# $Source: src/usr/diag/prdf/common/prd_framework.mk $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2005,2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
+
+# Object files for prd shared library
+
+######## Framework ########
 
 prd_framework = \
  iipTemplates.o \
  prdfTrace.o \
  prdfMain.o
 
+prd_framework_includes = \
+ prdfMain.H \
+ prdf_service_codes.H
+
 ######## Util ########
 
 prd_util = \
@@ -37,6 +45,9 @@ prd_util = \
  prdfFilters.o \
  prdfAssert.o
 
+prd_util_includes = \
+ prdfCompressBuffer.H
+
 ######## Config ########
 
 prd_config = \
@@ -45,32 +56,48 @@ prd_config = \
  iipDomain.o \
  iipDomainContainer.o \
  prdfFabricDomain.o \
+ prdfParentDomain.o \
  prdfRuleChipDomain.o \
+ prdfPllDomain.o \
  iipSystem.o \
  prdfExtensibleDomain.o \
 
-# prdfParentDomain.o \
-# prdfPllDomain.o \
+prd_config_FSP = \
+ prdfChipPersist.o \
+ prdfSystemData.o
+
+prd_config_includes = \
 
 ######## Service ########
-# FIXME: partially finished....need to add more
+
 prd_service = \
  prdfServiceDataCollector.o \
  prdf_ras_services.o \
  prdfTargetServices.o \
  xspprdsdbug.o
 
+prd_service_FSP = \
+ prdfSdcFileControl.o
+
+prd_service_includes = \
+
 ######## Platform Specfic Services ########
 
 prd_env_service = \
  prdfHomRegisterAccess.o \
  prdfPlatServices.o
 
+prd_env_service_includes = \
+
 ######## Chip ########
-# FIXME: need to add prd_s to prdf/makefile
+
 prd_ss = \
  prdfMemoryMru.o
 
+prd_ss_includes = \
+ prdfMemoryMru.H \
+ prdfRepairHealth.H
+
 ######## Resolution ########
 
 prd_resolution = \
@@ -84,6 +111,8 @@ prd_resolution = \
  prdfClockResolution.o \
  prdfCaptureResolution.o
 
+prd_resolution_includes = \
+
 ######## Register ########
 
 prd_register = \
@@ -97,17 +126,15 @@ prd_register = \
  prdfCaptureData.o \
  prdfScanFacility.o
 
-# iipScanCommRegisterCluster.o \ not used
-
+prd_register_includes = \
 
-#FIXME: do we need to add this prd_mnfgtools to prdf/makefile?
 ######## Threshold ########
-#prd_mnfgtools = \
-# prdfMfgThresholdFile.o \
-# prdfMfgThresholdMgr.o \
-# prdfMesThresholds.o
 
-#prd_mnfgtools_includes = \
-# prdfMfgThresholds.H \
-# prdfMesThresholds.H
+prd_mnfgtools = \
+ prdfMfgThresholdFile.o \
+ prdfMfgThresholdMgr.o \
+ prdfMesThresholds.o
 
+prd_mnfgtools_includes = \
+ prdfMfgThresholds.H \
+ prdfMesThresholds.H
diff --git a/src/usr/diag/prdf/prd_pegasus.mk b/src/usr/diag/prdf/common/prd_pegasus.mk
index c6b285352..f07df82b2 100755
--- a/src/usr/diag/prdf/prd_pegasus.mk
+++ b/src/usr/diag/prdf/common/prd_pegasus.mk
@@ -1,32 +1,34 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/prd_pegasus.mk $
-# 
+#
+# $Source: src/usr/diag/prdf/common/prd_pegasus.mk $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 # Object files for prdf rule plugins for pegasus
 PRDF_RULE_PLUGINS_PEGASUS = \
     prdfP8Proc.o \
     prdfP8Mcs.o \
+    prdfP8Pll.o \
     prdfCenMba.o \
-    prdfCenMembuf.o
+    prdfCenMembuf.o \
+    prdfCenPll.o
 
 # Object files for PRDF rule plugins, but include sim extensions.
 PRDF_RULE_PLUGINS_PEGASUS_WSIM = \
@@ -35,8 +37,10 @@ PRDF_RULE_PLUGINS_PEGASUS_WSIM = \
 # PEGASUS specific objects, not rule related.
 prd_pegasus_specific = \
     prdfCalloutUtil.o \
-	prdfLineDelete.o \
-	prdfMemUtil.o \
+    prdfLineDelete.o \
+    prdfMemUtil.o \
     prdfPegasusConfigurator.o \
     prdfRegisterData.o
 
+prd_pegasus_specific_HB = \
+    prdfDramRepairs.o
diff --git a/src/usr/diag/prdf/prd_ruletable.mk b/src/usr/diag/prdf/common/prd_ruletable.mk
index d5f678cc8..c6aa261f0 100755
--- a/src/usr/diag/prdf/prd_ruletable.mk
+++ b/src/usr/diag/prdf/common/prd_ruletable.mk
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/prd_ruletable.mk $
-# 
+#
+# $Source: src/usr/diag/prdf/common/prd_ruletable.mk $
+#
 # IBM CONFIDENTIAL
-# 
+#
 # COPYRIGHT International Business Machines Corp. 2005,2012
-# 
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 PRDR_RULE_TABLE_FILES =	\
 	Proc.rule	\
diff --git a/src/usr/diag/prdf/prdfEnums.H b/src/usr/diag/prdf/common/prdfEnums.H
index 23a3d201d..697b5cca5 100755
--- a/src/usr/diag/prdf/prdfEnums.H
+++ b/src/usr/diag/prdf/common/prdfEnums.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/prdfEnums.H $                               */
+/* $Source: src/usr/diag/prdf/common/prdfEnums.H $                        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/prdfMain.C b/src/usr/diag/prdf/common/prdfMain.C
index 961727978..f785134cf 100755
--- a/src/usr/diag/prdf/prdfMain.C
+++ b/src/usr/diag/prdf/common/prdfMain.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/prdfMain.C $                                */
+/* $Source: src/usr/diag/prdf/common/prdfMain.C $                         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -354,21 +354,6 @@ errlHndl_t startScrub( const TARGETING::TargetHandle_t i_pTarget )
     return o_err;
 }
 
-//------------------------------------------------------------------------------
-
-int32_t restoreDramRepairs( const TARGETING::TargetHandle_t i_pTarget )
-{
-    PRDF_ENTER( "PRDF::restoreDramRepairs()" );
-
-    int32_t o_rc = SUCCESS;
-
-    // TODO: Will be implemented later
-
-    PRDF_EXIT( "PRDF::restoreDramRepairs()" );
-
-    return o_rc;
-}
-
 #endif // __HOSTBOOT_MODULE
 
 //------------------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/prdfTrace.C b/src/usr/diag/prdf/common/prdfTrace.C
index 9a6635082..39bebe5ae 100755
--- a/src/usr/diag/prdf/prdfTrace.C
+++ b/src/usr/diag/prdf/common/prdfTrace.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/prdfTrace.C $                               */
+/* $Source: src/usr/diag/prdf/common/prdfTrace.C $                        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/prdfTrace.H b/src/usr/diag/prdf/common/prdfTrace.H
index 323ca0db2..1a67febf2 100755
--- a/src/usr/diag/prdf/prdfTrace.H
+++ b/src/usr/diag/prdf/common/prdfTrace.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/prdfTrace.H $                               */
+/* $Source: src/usr/diag/prdf/common/prdfTrace.H $                        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/prdf_types.h b/src/usr/diag/prdf/common/prdf_types.h
index 70e3946b4..ce103e61a 100755
--- a/src/usr/diag/prdf/prdf_types.h
+++ b/src/usr/diag/prdf/common/prdf_types.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/prdf_types.h $                              */
+/* $Source: src/usr/diag/prdf/common/prdf_types.h $                       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/CcAutoDeletePointer.h b/src/usr/diag/prdf/common/util/CcAutoDeletePointer.h
index 3c452f59b..22560e0fb 100755
--- a/src/usr/diag/prdf/util/CcAutoDeletePointer.h
+++ b/src/usr/diag/prdf/common/util/CcAutoDeletePointer.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/CcAutoDeletePointer.h $                */
+/* $Source: src/usr/diag/prdf/common/util/CcAutoDeletePointer.h $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/CcAutoDeletePointer.inl b/src/usr/diag/prdf/common/util/CcAutoDeletePointer.inl
index 9e50a1724..d8b5c656e 100755
--- a/src/usr/diag/prdf/util/CcAutoDeletePointer.inl
+++ b/src/usr/diag/prdf/common/util/CcAutoDeletePointer.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/CcAutoDeletePointer.inl $              */
+/* $Source: src/usr/diag/prdf/common/util/CcAutoDeletePointer.inl $       */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/CcSynch.h b/src/usr/diag/prdf/common/util/CcSynch.h
index b3945e1fc..8be57bb65 100755
--- a/src/usr/diag/prdf/util/CcSynch.h
+++ b/src/usr/diag/prdf/common/util/CcSynch.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/CcSynch.h $                            */
+/* $Source: src/usr/diag/prdf/common/util/CcSynch.h $                     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/CcSynch.inl b/src/usr/diag/prdf/common/util/CcSynch.inl
index 5fb4c12ca..09371b95d 100755
--- a/src/usr/diag/prdf/util/CcSynch.inl
+++ b/src/usr/diag/prdf/common/util/CcSynch.inl
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/CcSynch.inl $                          */
+/* $Source: src/usr/diag/prdf/common/util/CcSynch.inl $                   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilFunct.H b/src/usr/diag/prdf/common/util/UtilFunct.H
index 3d0837a2c..07e113326 100755
--- a/src/usr/diag/prdf/util/UtilFunct.H
+++ b/src/usr/diag/prdf/common/util/UtilFunct.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilFunct.H $                          */
+/* $Source: src/usr/diag/prdf/common/util/UtilFunct.H $                   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilHash.H b/src/usr/diag/prdf/common/util/UtilHash.H
index 84c3577ca..da03cf2d9 100755
--- a/src/usr/diag/prdf/util/UtilHash.H
+++ b/src/usr/diag/prdf/common/util/UtilHash.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilHash.H $                           */
+/* $Source: src/usr/diag/prdf/common/util/UtilHash.H $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilMapX.H b/src/usr/diag/prdf/common/util/UtilMapX.H
index df5d1a74d..208d7f784 100755
--- a/src/usr/diag/prdf/util/UtilMapX.H
+++ b/src/usr/diag/prdf/common/util/UtilMapX.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilMapX.H $                           */
+/* $Source: src/usr/diag/prdf/common/util/UtilMapX.H $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilSMap.H b/src/usr/diag/prdf/common/util/UtilSMap.H
index 0c176a99e..c47f36c19 100755
--- a/src/usr/diag/prdf/util/UtilSMap.H
+++ b/src/usr/diag/prdf/common/util/UtilSMap.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilSMap.H $                           */
+/* $Source: src/usr/diag/prdf/common/util/UtilSMap.H $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilTree.C b/src/usr/diag/prdf/common/util/UtilTree.C
index 0d9851d1f..5eeaf3e43 100755
--- a/src/usr/diag/prdf/util/UtilTree.C
+++ b/src/usr/diag/prdf/common/util/UtilTree.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilTree.C $                           */
+/* $Source: src/usr/diag/prdf/common/util/UtilTree.C $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilTree.H b/src/usr/diag/prdf/common/util/UtilTree.H
index 100662e8a..b8c18e67e 100755
--- a/src/usr/diag/prdf/util/UtilTree.H
+++ b/src/usr/diag/prdf/common/util/UtilTree.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilTree.H $                           */
+/* $Source: src/usr/diag/prdf/common/util/UtilTree.H $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/UtilTreeX.H b/src/usr/diag/prdf/common/util/UtilTreeX.H
index 7c0afe1a9..820adf251 100755
--- a/src/usr/diag/prdf/util/UtilTreeX.H
+++ b/src/usr/diag/prdf/common/util/UtilTreeX.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/UtilTreeX.H $                          */
+/* $Source: src/usr/diag/prdf/common/util/UtilTreeX.H $                   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipbits.h b/src/usr/diag/prdf/common/util/iipbits.h
index 1cf5212a4..4d00b5cc3 100755
--- a/src/usr/diag/prdf/util/iipbits.h
+++ b/src/usr/diag/prdf/common/util/iipbits.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipbits.h $                            */
+/* $Source: src/usr/diag/prdf/common/util/iipbits.h $                     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipbtlst.h b/src/usr/diag/prdf/common/util/iipbtlst.h
index 96ec47307..6f0f5d840 100755
--- a/src/usr/diag/prdf/util/iipbtlst.h
+++ b/src/usr/diag/prdf/common/util/iipbtlst.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipbtlst.h $                           */
+/* $Source: src/usr/diag/prdf/common/util/iipbtlst.h $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipdgtb.C b/src/usr/diag/prdf/common/util/iipdgtb.C
index 0438b6ac8..c405c9adb 100755
--- a/src/usr/diag/prdf/util/iipdgtb.C
+++ b/src/usr/diag/prdf/common/util/iipdgtb.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipdgtb.C $                            */
+/* $Source: src/usr/diag/prdf/common/util/iipdgtb.C $                     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipdgtb.h b/src/usr/diag/prdf/common/util/iipdgtb.h
index 248aed1fd..94aaa6c56 100755
--- a/src/usr/diag/prdf/util/iipdgtb.h
+++ b/src/usr/diag/prdf/common/util/iipdgtb.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipdgtb.h $                            */
+/* $Source: src/usr/diag/prdf/common/util/iipdgtb.h $                     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipdigit.C b/src/usr/diag/prdf/common/util/iipdigit.C
index 62892eb8f..5fc676844 100755
--- a/src/usr/diag/prdf/util/iipdigit.C
+++ b/src/usr/diag/prdf/common/util/iipdigit.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipdigit.C $                           */
+/* $Source: src/usr/diag/prdf/common/util/iipdigit.C $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipdigit.h b/src/usr/diag/prdf/common/util/iipdigit.h
index 360ff9631..b81d2e1a9 100755
--- a/src/usr/diag/prdf/util/iipdigit.h
+++ b/src/usr/diag/prdf/common/util/iipdigit.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipdigit.h $                           */
+/* $Source: src/usr/diag/prdf/common/util/iipdigit.h $                    */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/iipfltr.h b/src/usr/diag/prdf/common/util/iipfltr.h
index 9349085b2..182bd4ac4 100755
--- a/src/usr/diag/prdf/util/iipfltr.h
+++ b/src/usr/diag/prdf/common/util/iipfltr.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/iipfltr.h $                            */
+/* $Source: src/usr/diag/prdf/common/util/iipfltr.h $                     */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfAssert.C b/src/usr/diag/prdf/common/util/prdfAssert.C
index 012480e71..4762e11da 100755
--- a/src/usr/diag/prdf/util/prdfAssert.C
+++ b/src/usr/diag/prdf/common/util/prdfAssert.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfAssert.C $                         */
+/* $Source: src/usr/diag/prdf/common/util/prdfAssert.C $                  */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfAssert.h b/src/usr/diag/prdf/common/util/prdfAssert.h
index 0b7e32f31..5e5b83e15 100755
--- a/src/usr/diag/prdf/util/prdfAssert.h
+++ b/src/usr/diag/prdf/common/util/prdfAssert.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfAssert.h $                         */
+/* $Source: src/usr/diag/prdf/common/util/prdfAssert.h $                  */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfBitKey.C b/src/usr/diag/prdf/common/util/prdfBitKey.C
index 5ff74ee70..0245d26b3 100755
--- a/src/usr/diag/prdf/util/prdfBitKey.C
+++ b/src/usr/diag/prdf/common/util/prdfBitKey.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfBitKey.C $                         */
+/* $Source: src/usr/diag/prdf/common/util/prdfBitKey.C $                  */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfBitKey.H b/src/usr/diag/prdf/common/util/prdfBitKey.H
index 4bf2218ec..de2f4b8e9 100755
--- a/src/usr/diag/prdf/util/prdfBitKey.H
+++ b/src/usr/diag/prdf/common/util/prdfBitKey.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfBitKey.H $                         */
+/* $Source: src/usr/diag/prdf/common/util/prdfBitKey.H $                  */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfBitString.C b/src/usr/diag/prdf/common/util/prdfBitString.C
index 8501cb01d..bc9fa8907 100755
--- a/src/usr/diag/prdf/util/prdfBitString.C
+++ b/src/usr/diag/prdf/common/util/prdfBitString.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfBitString.C $                      */
+/* $Source: src/usr/diag/prdf/common/util/prdfBitString.C $               */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfBitString.H b/src/usr/diag/prdf/common/util/prdfBitString.H
index e253430ce..4062f0e8a 100755
--- a/src/usr/diag/prdf/util/prdfBitString.H
+++ b/src/usr/diag/prdf/common/util/prdfBitString.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfBitString.H $                      */
+/* $Source: src/usr/diag/prdf/common/util/prdfBitString.H $               */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfErrlSmartPtr.C b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C
index b82264648..8a6e74cff 100755
--- a/src/usr/diag/prdf/util/prdfErrlSmartPtr.C
+++ b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfErrlSmartPtr.C $                   */
+/* $Source: src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfErrlSmartPtr.H b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.H
index 0afeda4d1..51782117c 100755
--- a/src/usr/diag/prdf/util/prdfErrlSmartPtr.H
+++ b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfErrlSmartPtr.H $                   */
+/* $Source: src/usr/diag/prdf/common/util/prdfErrlSmartPtr.H $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfErrorSignature.H b/src/usr/diag/prdf/common/util/prdfErrorSignature.H
index 40efb164e..a0bf1bb19 100755
--- a/src/usr/diag/prdf/util/prdfErrorSignature.H
+++ b/src/usr/diag/prdf/common/util/prdfErrorSignature.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfErrorSignature.H $                 */
+/* $Source: src/usr/diag/prdf/common/util/prdfErrorSignature.H $          */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfFilters.C b/src/usr/diag/prdf/common/util/prdfFilters.C
index 29c7d26bc..ae5b294e7 100755
--- a/src/usr/diag/prdf/util/prdfFilters.C
+++ b/src/usr/diag/prdf/common/util/prdfFilters.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfFilters.C $                        */
+/* $Source: src/usr/diag/prdf/common/util/prdfFilters.C $                 */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfFilters.H b/src/usr/diag/prdf/common/util/prdfFilters.H
index 8fff8c387..3fd5da02d 100755
--- a/src/usr/diag/prdf/util/prdfFilters.H
+++ b/src/usr/diag/prdf/common/util/prdfFilters.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfFilters.H $                        */
+/* $Source: src/usr/diag/prdf/common/util/prdfFilters.H $                 */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfFlyWeight.C b/src/usr/diag/prdf/common/util/prdfFlyWeight.C
index cb386c294..1df6f46f5 100755
--- a/src/usr/diag/prdf/util/prdfFlyWeight.C
+++ b/src/usr/diag/prdf/common/util/prdfFlyWeight.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfFlyWeight.C $                      */
+/* $Source: src/usr/diag/prdf/common/util/prdfFlyWeight.C $               */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfFlyWeight.H b/src/usr/diag/prdf/common/util/prdfFlyWeight.H
index 0554e66ac..ec9eae1a6 100755
--- a/src/usr/diag/prdf/util/prdfFlyWeight.H
+++ b/src/usr/diag/prdf/common/util/prdfFlyWeight.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfFlyWeight.H $                      */
+/* $Source: src/usr/diag/prdf/common/util/prdfFlyWeight.H $               */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfFlyWeightS.C b/src/usr/diag/prdf/common/util/prdfFlyWeightS.C
index 9834ac809..76e001d25 100755
--- a/src/usr/diag/prdf/util/prdfFlyWeightS.C
+++ b/src/usr/diag/prdf/common/util/prdfFlyWeightS.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfFlyWeightS.C $                     */
+/* $Source: src/usr/diag/prdf/common/util/prdfFlyWeightS.C $              */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -281,6 +281,7 @@ void FlyWeightS<T,S>::increaseSize()
 
     iv_rows.erase(std::remove(iv_rows.begin(), iv_rows.end(), (void *) NULL),
                   iv_rows.end());
+
 };
 
 /*
diff --git a/src/usr/diag/prdf/util/prdfFlyWeightS.H b/src/usr/diag/prdf/common/util/prdfFlyWeightS.H
index 6b7a32b15..3a571e95d 100755
--- a/src/usr/diag/prdf/util/prdfFlyWeightS.H
+++ b/src/usr/diag/prdf/common/util/prdfFlyWeightS.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfFlyWeightS.H $                     */
+/* $Source: src/usr/diag/prdf/common/util/prdfFlyWeightS.H $              */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfHeapBucketSize.H b/src/usr/diag/prdf/common/util/prdfHeapBucketSize.H
index ee2281a7f..cd66d0f72 100755
--- a/src/usr/diag/prdf/util/prdfHeapBucketSize.H
+++ b/src/usr/diag/prdf/common/util/prdfHeapBucketSize.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfHeapBucketSize.H $                 */
+/* $Source: src/usr/diag/prdf/common/util/prdfHeapBucketSize.H $          */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfRegisterData.C b/src/usr/diag/prdf/common/util/prdfRegisterData.C
index 3ef195fd7..04aaa6208 100755
--- a/src/usr/diag/prdf/util/prdfRegisterData.C
+++ b/src/usr/diag/prdf/common/util/prdfRegisterData.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfRegisterData.C $                   */
+/* $Source: src/usr/diag/prdf/common/util/prdfRegisterData.C $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfRegisterData.H b/src/usr/diag/prdf/common/util/prdfRegisterData.H
index 4d316c0f4..80f073384 100755
--- a/src/usr/diag/prdf/util/prdfRegisterData.H
+++ b/src/usr/diag/prdf/common/util/prdfRegisterData.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfRegisterData.H $                   */
+/* $Source: src/usr/diag/prdf/common/util/prdfRegisterData.H $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/prdfTimer.H b/src/usr/diag/prdf/common/util/prdfTimer.H
index f649c8399..30b369e7f 100755
--- a/src/usr/diag/prdf/util/prdfTimer.H
+++ b/src/usr/diag/prdf/common/util/prdfTimer.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/prdfTimer.H $                          */
+/* $Source: src/usr/diag/prdf/common/util/prdfTimer.H $                   */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/xspprdFilterLink.h b/src/usr/diag/prdf/common/util/xspprdFilterLink.h
index 2cbb2797f..3fd0b91c0 100755
--- a/src/usr/diag/prdf/util/xspprdFilterLink.h
+++ b/src/usr/diag/prdf/common/util/xspprdFilterLink.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/xspprdFilterLink.h $                   */
+/* $Source: src/usr/diag/prdf/common/util/xspprdFilterLink.h $            */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/util/xspprdScanCommFilter.h b/src/usr/diag/prdf/common/util/xspprdScanCommFilter.h
index 6f9ec061a..a64820fe9 100755
--- a/src/usr/diag/prdf/util/xspprdScanCommFilter.h
+++ b/src/usr/diag/prdf/common/util/xspprdScanCommFilter.h
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/util/xspprdScanCommFilter.h $               */
+/* $Source: src/usr/diag/prdf/common/util/xspprdScanCommFilter.h $        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile
index dfa6ba048..4c7f25989 100755
--- a/src/usr/diag/prdf/framework/rule/makefile
+++ b/src/usr/diag/prdf/framework/rule/makefile
@@ -25,6 +25,10 @@ ROOTPATH = ../../../../../..
 
 RULEOBJDIR = ${ROOTPATH}/obj/modules/prdf/rule
 
+PRD_USR_PATH = ${ROOTPATH}/src/usr/diag/prdf
+
+VPATH = ${PRD_USR_PATH}/common/framework/rule
+
 #------------------------------------------------------------------------------
 # Generated files
 #------------------------------------------------------------------------------
@@ -51,7 +55,7 @@ PRDR_CMP_YACC_H_PATH = ${RULEOBJDIR}/${PRDR_CMP_YACC_H}
 PRDR_CMP_FLEX_o_PATH = ${RULEOBJDIR}/${PRDR_CMP_FLEX_o}
 PRDR_CMP_FLEX_C_PATH = ${RULEOBJDIR}/${PRDR_CMP_FLEX_C}
 
-include ../../prd_ruletable.mk # for PRDR_RULE_TABLE_TARGETS
+include ../../common/prd_ruletable.mk # for PRDR_RULE_TABLE_TARGETS
 
 #-------------------------------------------------------------------------------
 # code_pass
@@ -95,19 +99,25 @@ USERDEFINES = -D__HOSTBOOT_MODULE -O3 -pipe
 
 ${PRDR_CMP_YACC_o_PATH}: ${PRDR_CMP_YACC_C_PATH} ${PRDR_CMP_YACC_H_PATH}
 	i686-mcp6-g++ -c $(USERDEFINES) $< \
-		-I ./ -I ../../util -I ${RULEOBJDIR} \
+		-I ${PRD_USR_PATH}/common/framework/rule \
+		-I ${PRD_USR_PATH}/common/util -I ${RULEOBJDIR} \
 		-o $@
 
 ${PRDR_CMP_FLEX_o_PATH}: ${PRDR_CMP_FLEX_C_PATH} ${PRDR_CMP_YACC_H_PATH}
 	i686-mcp6-g++ -c $(USERDEFINES) $< \
-		-I ./ -I ../../util -I ${RULEOBJDIR} \
+		-I ${PRD_USR_PATH}/common/framework/rule \
+		-I ${PRD_USR_PATH}/common/util -I ${RULEOBJDIR} \
 		-o $@
 
 ${PRDR_CMP_o_PATH}: ${PRDR_CMP_C}
 	mkdir -p ${RULEOBJDIR}
 	i686-mcp6-g++ -c $(USERDEFINES) $< \
-		-I ./ -I ../.. -I ../../util -I ${GENDIR} -I ${RULEOBJDIR} \
-		-I ../resolution -I ../service \
+		-I ${PRD_USR_PATH}/common/framework/rule \
+		-I ${PRD_USR_PATH}/common \
+		-I ${PRD_USR_PATH}/common/util \
+		-I ${GENDIR} -I ${RULEOBJDIR} \
+		-I ${PRD_USR_PATH}/common/framework/resolution \
+		-I ${PRD_USR_PATH}/common/framework/service \
 		-o $@
 
 ${PRDR_CMP_PATH}: ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} \
@@ -120,12 +130,12 @@ ${PRDR_CMP_PATH}: ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} \
 # Build the .prf files
 #------------------------------------------------------------------------------
 
-vpath %.rule ../../plat/pegasus
-PRDRPP_SEARCHDIRS = -I../../plat/pegasus
+vpath %.rule ../../common/plat/pegasus
+PRDRPP_SEARCHDIRS = -I../../common/plat/pegasus
 
 # Build .prf files from .rule files and store them in ${RULEOBJDIR}
 ${RULEOBJDIR}/%.prf : %.rule ${PRDR_CMP_PATH}
-	cat $< | ./prdrpp ${PRDRPP_SEARCHDIRS} \
+	cat $< | ${PRD_USR_PATH}/common/framework/rule/prdrpp ${PRDRPP_SEARCHDIRS} \
 		   | i686-mcp6-jail ${PRDR_CMP_PATH} $@
 
 # Copy all .prf files from ${RULEOBJDIR} to ${IMGDIR}
diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index 79d811b3f..b4a6a52e9 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -33,16 +33,18 @@ MODULE = prdf
 PRD_USR_PATH = ${ROOTPATH}/src/usr/diag/prdf
 
 VPATH =  \
-    util \
-    plat \
-    plat/pegasus \
+    common \
+    common/util \
+    common/plat \
+    common/plat/pegasus \
+    common/framework \
+    common/framework/resolution \
+    common/framework/register \
+    common/framework/service \
+    common/framework/config \
+    common/framework/rule \
     framework \
-    framework/resolution \
-    framework/register \
-    framework/service \
-    framework/config \
     framework/rule \
-    mnfgtools
 
 #FIXME: we can remove most of these as well if we have them include correctly
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
@@ -51,28 +53,39 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/util
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/errl
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp
 
 #FIXME: once we fix the PRD includes, we can move most of the prd subdirs below
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag/prdf
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag/prdf/common
 EXTRAINCDIR += ${PRD_USR_PATH}
-EXTRAINCDIR += ${PRD_USR_PATH}/util
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/service
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/register
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/resolution
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/config
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/rule
-EXTRAINCDIR += ${PRD_USR_PATH}/plat
-EXTRAINCDIR += ${PRD_USR_PATH}/plat/pegasus
-EXTRAINCDIR += ${PRD_USR_PATH}/mnfgtools
+EXTRAINCDIR += ${PRD_USR_PATH}/common
+EXTRAINCDIR += ${PRD_USR_PATH}/common/util
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/service
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/register
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/resolution
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/config
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/rule
+EXTRAINCDIR += ${PRD_USR_PATH}/common/plat
+EXTRAINCDIR += ${PRD_USR_PATH}/common/plat/pegasus
 
 #------------------------------------------------------------------------------
 # objects
 #------------------------------------------------------------------------------
-include prd_framework.mk
-include prd_ruletable.mk
-include prd_pegasus.mk
-
-OBJS = ${prd_framework} ${prd_util} ${prd_register} ${prd_resolution} ${prd_ruletable} ${prd_service} ${prd_env_service} ${prd_config} ${prd_pegasus_specific} ${PRDF_RULE_PLUGINS_PEGASUS_WSIM} ${PRDF_RULE_PLUGINS_PEGASUS}
+include common/prd_framework.mk
+include common/prd_ruletable.mk
+include common/prd_pegasus.mk
 
+OBJS = ${prd_framework} \
+	   ${prd_util} \
+	   ${prd_register} \
+	   ${prd_resolution} \
+	   ${prd_ruletable} \
+	   ${prd_service} \
+	   ${prd_env_service} \
+	   ${prd_config} \
+	   ${prd_pegasus_specific} ${prd_pegasus_specific_HB} \
+	   ${PRDF_RULE_PLUGINS_PEGASUS_WSIM} \
+	   ${PRDF_RULE_PLUGINS_PEGASUS}
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/plat/pegasus/prdfP8Proc.C
deleted file mode 100755
index b921f7dc1..000000000
--- a/src/usr/diag/prdf/plat/pegasus/prdfP8Proc.C
+++ /dev/null
@@ -1,126 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/diag/prdf/plat/pegasus/prdfP8Proc.C $                 */
-/*                                                                        */
-/* IBM CONFIDENTIAL                                                       */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
-/*                                                                        */
-/* p1                                                                     */
-/*                                                                        */
-/* Object Code Only (OCO) source materials                                */
-/* Licensed Internal Code Source Materials                                */
-/* IBM HostBoot Licensed Internal Code                                    */
-/*                                                                        */
-/* The source code for this program is not published or otherwise         */
-/* divested of its trade secrets, irrespective of what has been           */
-/* deposited with the U.S. Copyright Office.                              */
-/*                                                                        */
-/* Origin: 30                                                             */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-/** @file  prdfP8Proc.C
- *  @brief Contains all the plugin code for the PRD P8 Proc
- */
-#include <prdfPluginDef.H>
-#include <iipServiceDataCollector.h>
-#include <prdfExtensibleChip.H>
-#include <prdfPlatServices.H>
-#include <prdfPluginMap.H>
-
-namespace PRDF
-{
-namespace Proc
-{
-
-//##############################################################################
-//
-//                             Special plugins
-//
-//##############################################################################
-
-/**
- * @brief  Plugin that initializes the P8 Mba data bundle.
- * @param  i_chip P8 chip.
- * @return SUCCESS
- */
-int32_t Initialize( PrdfExtensibleChip * i_chip )
-{
-    // FIXME: Add proper initialization as per requirement
-    return SUCCESS;
-}
-PRDF_PLUGIN_DEFINE( Proc, Initialize );
-
-/**
- * @fn CheckForRecovered
- * @brief Used when the chip has a CHECK_STOP attention to check for the
- * presence of recovered errors.
- */
-int32_t CheckForRecovered(PrdfExtensibleChip * i_chip,
-                          bool & o_hasRecovered)
-{
-    //FIXME: need to fully implement for P8
-    o_hasRecovered = false;
-
-    return SUCCESS;
-} PRDF_PLUGIN_DEFINE( Proc, CheckForRecovered );
-
-
-
-//------------------------------------------------------------------------------
-/**
- * @fn prdCheckForRecoveredSev
- * @brief Used when the chip is queried, by the fabric domain, for RECOVERED
- * attentions to assign a severity to the attention for sorting.
- * @param[in]   i_chip - P8 chip
- * @param[out]  o_sev - Priority order (lowest to highest):
- *  1 - Core chiplet checkstop
- *  2 - Core chiplet error
- *  3 - PCB chiplet error (TOD logic)
- *  4 - Other error
- *  5 - Memory controller chiplet
- *
- * @return SUCCESS
- *
- */
-int32_t CheckForRecoveredSev(PrdfExtensibleChip * i_chip,
-                             uint32_t & o_sev)
-{
-    //FIXME: need to fully implement for P8
-    o_sev = 1;
-
-    return SUCCESS;
-
-} PRDF_PLUGIN_DEFINE( Proc, CheckForRecoveredSev );
-
-/** @func GetCheckstopInfo
- *  To be called from the fabric domain to gather Checkstop information.  This
- *  information is used in a sorting algorithm.
- *
- *  This is a plugin function: GetCheckstopInfo
- *
- *  @param i_chip - The chip.
- *  @param o_wasInternal - True if this chip has an internal checkstop.
- *  @param o_externalChips - List of external fabrics driving checkstop.
- *  @param o_wofValue - Current WOF value (unused for now).
- */
-int32_t GetCheckstopInfo(PrdfExtensibleChip * i_chip,
-                   bool & o_wasInternal,
-                   TARGETING::TargetHandleList & o_externalChips,
-                   uint64_t & o_wofValue)
-{
-    // Clear parameters.
-    o_wasInternal = true; //FIXME: default to true until fabric sorting is done
-    o_externalChips.erase(o_externalChips.begin(), o_externalChips.end());
-    o_wofValue = 0;
-
-    // FIXME: this will need to implement under fabric sorting algo
-
-    return SUCCESS;
-
-} PRDF_PLUGIN_DEFINE( Proc, GetCheckstopInfo );
-
-} // end namespace Proc
-} // end namespace PRDF
diff --git a/src/usr/diag/prdf/test/makefile b/src/usr/diag/prdf/test/makefile
index bdabc6d28..7310bf317 100755
--- a/src/usr/diag/prdf/test/makefile
+++ b/src/usr/diag/prdf/test/makefile
@@ -31,15 +31,17 @@ MODULE = testprdf
 PRD_USR_PATH = ${ROOTPATH}/src/usr/diag/prdf
 
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag/prdf
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag/prdf/common
 EXTRAINCDIR += ${PRD_USR_PATH}
-EXTRAINCDIR += ${PRD_USR_PATH}/util
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/service
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/register
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/resolution
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/config
-EXTRAINCDIR += ${PRD_USR_PATH}/framework/rule
-EXTRAINCDIR += ${PRD_USR_PATH}/plat
-EXTRAINCDIR += ${PRD_USR_PATH}/plat/pegasus
+EXTRAINCDIR += ${PRD_USR_PATH}/common
+EXTRAINCDIR += ${PRD_USR_PATH}/common/util
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/service
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/register
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/resolution
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/config
+EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/rule
+EXTRAINCDIR += ${PRD_USR_PATH}/common/plat
+EXTRAINCDIR += ${PRD_USR_PATH}/common/plat/pegasus
 EXTRAINCDIR += ${PRD_USR_PATH}/mnfgtools
 EXTRAINCDIR += ${PRD_USR_PATH}/test
 
@@ -48,6 +50,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/errl
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp
 
 #------------------------------------------------------------------------------
 # objects
diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
index 4155558d1..1f5664656 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
@@ -72,7 +72,7 @@
 // #include    "host_startPRD_pbus/host_startPRD_pbus.H"
 // #include    "host_attnlisten_proc/host_attnlisten_proc.H"
 #include    "proc_fab_iovalid/proc_fab_iovalid.H"
-#include    <diag/prdf/prdfMain.H>
+#include    <diag/prdf/common/prdfMain.H>
 
 namespace   EDI_EI_INITIALIZATION
 {