PRD: Add rules for connected peer resolution

Change-Id: I0af5b6a32059d22e7183a5bd2b4702971c21769b
RTC: 72645
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/6289
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7209

4 files changed, 7 insertions, 70 deletions

diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule
index e9810f67a..c5587db7f 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule
@@ -489,7 +489,7 @@ actionclass calloutAbus0Interface
 {
     callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);
     callout(connected(TYPE_ABUS, 0), MRU_MEDA);
-    funccall("calloutPeerBus_abus0");
+    callout(connected_peer(TYPE_ABUS, 0), MRU_MEDA);
 };
 
 /** Callout the ABUS 1 interface */
@@ -497,7 +497,7 @@ actionclass calloutAbus1Interface
 {
     callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);
     callout(connected(TYPE_ABUS, 1), MRU_MEDA);
-    funccall("calloutPeerBus_abus1");
+    callout(connected_peer(TYPE_ABUS, 1), MRU_MEDA);
 };
 
 /** Callout the ABUS 2 interface */
@@ -505,7 +505,7 @@ actionclass calloutAbus2Interface
 {
     callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);
     callout(connected(TYPE_ABUS, 2), MRU_MEDA);
-    funccall("calloutPeerBus_abus2");
+    callout(connected_peer(TYPE_ABUS, 2), MRU_MEDA);
 };
 
 /** Callout the ABUS 0 interface, threshold 1 */
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
index a00b1a3f3..bb9c76c7b 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule
@@ -3335,4 +3335,3 @@ actionclass callout2ndLvlMedThr1
     callout2ndLvlMed;
     threshold1;
 };
-
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
index e3311b177..167fd2d80 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_XBUS.rule
@@ -677,7 +677,7 @@ group gIoxFir_3 filter singlebit
 actionclass calloutXbus0Interface
 {
     callout(connected(TYPE_XBUS, 0), MRU_MEDA);
-    funccall("calloutPeerBus_xbus0");
+    callout(connected_peer(TYPE_XBUS, 0), MRU_MEDA);
     callout(procedure(PassiveFabric_OnNode_ENUM), MRU_LOW);
 };
 
@@ -685,7 +685,7 @@ actionclass calloutXbus0Interface
 actionclass calloutXbus1Interface
 {
     callout(connected(TYPE_XBUS, 1), MRU_MEDA);
-    funccall("calloutPeerBus_xbus1");
+    callout(connected_peer(TYPE_XBUS, 1), MRU_MEDA);
     callout(procedure(PassiveFabric_OnNode_ENUM), MRU_LOW);
 };
 
@@ -693,7 +693,7 @@ actionclass calloutXbus1Interface
 actionclass calloutXbus2Interface
 {
     callout(connected(TYPE_XBUS, 2), MRU_MEDA);
-    funccall("calloutPeerBus_xbus2");
+    callout(connected_peer(TYPE_XBUS, 2), MRU_MEDA);
     callout(procedure(PassiveFabric_OnNode_ENUM), MRU_LOW);
 };
 
@@ -701,7 +701,7 @@ actionclass calloutXbus2Interface
 actionclass calloutXbus3Interface
 {
     callout(connected(TYPE_XBUS, 3), MRU_MEDA);
-    funccall("calloutPeerBus_xbus3");
+    callout(connected_peer(TYPE_XBUS, 3), MRU_MEDA);
     callout(procedure(PassiveFabric_OnNode_ENUM), MRU_LOW);
 };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
index e77e092d4..053dd4535 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -597,68 +597,6 @@ PRDF_PLUGIN_DEFINE( Proc, isVeniceProc );
 //------------------------------------------------------------------------------
 
 /**
- * @brief  Callout the peer end point on the given bus (priority MRU_MEDA).
- * @param  i_chip A P8 chip.
- * @param  i_sc   The step code data struct.
- * @param  i_type Bus type (TYPE_XBUS or TYPE_ABUS).
- * @param  i_pos  Bus position.
- * @return SUCCESS
- */
-int32_t calloutPeerBus( ExtensibleChip * i_chip, STEP_CODE_DATA_STRUCT & i_sc,
-                        TYPE i_type, uint32_t i_pos )
-{
-    #define PRDF_FUNC "[Proc::calloutPeerBus] "
-
-    // FIXME RTC 72645 Can removed plugins once callout(connected()) is fixed.
-
-    do
-    {
-        TargetHandle_t srcEndPoint = getConnectedChild( i_chip->GetChipHandle(),
-                                                        i_type, i_pos );
-        if ( NULL == srcEndPoint )
-        {
-            PRDF_ERR( PRDF_FUNC"getConnectedChild(0x%08x,%d,%d) failed",
-                      i_chip->GetId(), i_type, i_pos );
-            break;
-        }
-
-        TargetHandle_t destEndPoint = getConnectedPeerTarget( srcEndPoint );
-        if ( NULL == destEndPoint )
-        {
-            PRDF_ERR( PRDF_FUNC"getConnectedPeerTarget(0x%08x) failed",
-                      getHuid(srcEndPoint) );
-            break;
-        }
-
-        i_sc.service_data->SetCallout( destEndPoint, MRU_MEDA );
-
-    } while (0);
-
-    return SUCCESS;
-
-    #undef PRDF_FUNC
-}
-
-#define PLUGIN_CALLOUT_PEER_BUS( BUS, TYPE, POS ) \
-int32_t calloutPeerBus_##BUS##POS( ExtensibleChip * i_chip, \
-                                   STEP_CODE_DATA_STRUCT & i_sc ) \
-{ return calloutPeerBus( i_chip, i_sc, TYPE, POS ); } \
-PRDF_PLUGIN_DEFINE( Proc, calloutPeerBus_##BUS##POS );
-
-PLUGIN_CALLOUT_PEER_BUS( xbus, TYPE_XBUS, 0 )
-PLUGIN_CALLOUT_PEER_BUS( xbus, TYPE_XBUS, 1 )
-PLUGIN_CALLOUT_PEER_BUS( xbus, TYPE_XBUS, 2 )
-PLUGIN_CALLOUT_PEER_BUS( xbus, TYPE_XBUS, 3 )
-
-PLUGIN_CALLOUT_PEER_BUS( abus, TYPE_ABUS, 0 )
-PLUGIN_CALLOUT_PEER_BUS( abus, TYPE_ABUS, 1 )
-PLUGIN_CALLOUT_PEER_BUS( abus, TYPE_ABUS, 2 )
-
-#undef PLUGIN_CALLOUT_PEER_BUS
-
-//------------------------------------------------------------------------------
-
-/**
  * @brief Call to check for configured PHB (before capturing FFDC)
  * @param  i_chip             P8 chip
  * @param  i_phbPos           PHB position