PRDF:Change in action for PSIHBFIR[5,6]

Based on discussion with hardware team, no interrupts are expected from
PSIHBFIR bit 5 and 6 during hostboot and during runtime. These two bits
are masked in hardware.

RTC:82351
Change-Id: Ib41b568fe740a9b20d025174b89a0e9c734f5083
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/6327
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7083

4 files changed, 11 insertions, 45 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
index 450d6ab7f..8d0507177 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
@@ -454,7 +454,6 @@ uint32_t prdrActionArgMap(const std::string & i_arg)
         g_ActionArgMap["TYPE_L4"]       = TARGETING::TYPE_L4;
         g_ActionArgMap["TYPE_MBA"]      = TARGETING::TYPE_MBA;
         g_ActionArgMap["TYPE_OCC"]      = TARGETING::TYPE_OCC;
-        g_ActionArgMap["TYPE_PSI"]      = TARGETING::TYPE_PSI;
 
         // Initialize symbolic callouts.
         for ( SymCallout_t * i = symCalloutArray; NULL != i->str; i++ )
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
index ac73b98a5..a1d9d850f 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
@@ -381,16 +381,15 @@ struct conn_t
             case TYPE_OSC:    order =  2; break;
             case TYPE_PROC:   order =  3; break;
             case TYPE_OCC:    order =  4; break;
-            case TYPE_PSI:    order =  5; break;
-            case TYPE_EX:     order =  6; break;
-            case TYPE_XBUS:   order =  7; break;
-            case TYPE_ABUS:   order =  8; break;
-            case TYPE_PCI:    order =  9; break;
-            case TYPE_MCS:    order = 10; break;
-            case TYPE_MEMBUF: order = 11; break;
-            case TYPE_L4:     order = 12; break;
-            case TYPE_MBA:    order = 13; break;
-            case TYPE_DIMM:   order = 14; break;
+            case TYPE_EX:     order =  5; break;
+            case TYPE_XBUS:   order =  6; break;
+            case TYPE_ABUS:   order =  7; break;
+            case TYPE_PCI:    order =  8; break;
+            case TYPE_MCS:    order =  9; break;
+            case TYPE_MEMBUF: order = 10; break;
+            case TYPE_L4:     order = 11; break;
+            case TYPE_MBA:    order = 12; break;
+            case TYPE_DIMM:   order = 13; break;
             default: ;
         }
 
@@ -426,7 +425,6 @@ int32_t getAssociationType( TARGETING::TargetHandle_t i_target,
         { TYPE_NODE,   TYPE_OSC,    TargetService::CHILD_BY_AFFINITY },
         { TYPE_NODE,   TYPE_PROC,   TargetService::CHILD_BY_AFFINITY },
         { TYPE_NODE,   TYPE_OCC,    TargetService::CHILD_BY_AFFINITY },
-        { TYPE_NODE,   TYPE_PSI,    TargetService::CHILD_BY_AFFINITY },
         { TYPE_NODE,   TYPE_EX,     TargetService::CHILD_BY_AFFINITY },
         { TYPE_NODE,   TYPE_XBUS,   TargetService::CHILD_BY_AFFINITY },
         { TYPE_NODE,   TYPE_ABUS,   TargetService::CHILD_BY_AFFINITY },
@@ -441,7 +439,6 @@ int32_t getAssociationType( TARGETING::TargetHandle_t i_target,
 
         { TYPE_PROC,   TYPE_NODE,   TargetService::PARENT_BY_AFFINITY },
         { TYPE_PROC,   TYPE_OCC,    TargetService::CHILD_BY_AFFINITY  },
-        { TYPE_PROC,   TYPE_PSI,    TargetService::CHILD_BY_AFFINITY  },
         { TYPE_PROC,   TYPE_EX,     TargetService::CHILD_BY_AFFINITY  },
         { TYPE_PROC,   TYPE_XBUS,   TargetService::CHILD_BY_AFFINITY  },
         { TYPE_PROC,   TYPE_ABUS,   TargetService::CHILD_BY_AFFINITY  },
@@ -455,9 +452,6 @@ int32_t getAssociationType( TARGETING::TargetHandle_t i_target,
         { TYPE_OCC,    TYPE_NODE,    TargetService::PARENT_BY_AFFINITY  },
         { TYPE_OCC,    TYPE_PROC,    TargetService::PARENT_BY_AFFINITY  },
 
-        { TYPE_PSI,    TYPE_NODE,    TargetService::PARENT_BY_AFFINITY  },
-        { TYPE_PSI,    TYPE_PROC,    TargetService::PARENT_BY_AFFINITY  },
-
         { TYPE_EX,     TYPE_NODE,   TargetService::PARENT_BY_AFFINITY },
         { TYPE_EX,     TYPE_PROC,   TargetService::PARENT_BY_AFFINITY },
 
@@ -708,7 +702,6 @@ TargetHandle_t getConnectedPeerTarget( TargetHandle_t i_target )
         {
             case TYPE_XBUS:
             case TYPE_ABUS:
-            case TYPE_PSI:
 
                 o_target = i_target->getAttr<ATTR_PEER_TARGET>();
                 break;
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 4f6c75f80..a767971c3 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
@@ -1558,12 +1558,12 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[5]
      *  FSP_ECC_ERR_CE
      */
-    (PsiHbFir, bit(5)) ? calloutPsiThr32;
+    (PsiHbFir, bit(5)) ? defaultMaskedError;
 
     /** PSIHBFIR[6]
      *  FSP_ECC_ERR_UE
      */
-    (PsiHbFir, bit(6)) ? calloutPsiThr1;
+    (PsiHbFir, bit(6)) ? defaultMaskedError;
 
     /** PSIHBFIR[7]
      *  ERROR_STATE
@@ -3097,28 +3097,3 @@ actionclass callout2ndLvlMedThr1
     threshold1;
 };
 
-/** callout both ends of PSI Link.Threshold is 32 events per day.
- */
-actionclass  calloutPsiThr32
-{
-#FIXME RTC 23127 Discussion in progress on this.Based on the outcome of
-# discussion, there are chances that we may replace this and calloutPsiThr1
-# with default masked error.
-
-    calloutPsiLink;
-    threshold32pday;
-};
-
-/** callout both ends of PSI Link on first instance.*/
-actionclass  calloutPsiThr1
-{
-    calloutPsiLink;
-    threshold1;
-};
-
-/** callout both ends of PSI link */
-actionclass  calloutPsiLink
-{
-    callout(connected(TYPE_PSI, 0), MRU_MEDA);
-    funccall("calloutPeerBus_psi0");
-};
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
index 32474a354..0de1130bd 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -627,7 +627,6 @@ 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 )
-PLUGIN_CALLOUT_PEER_BUS( psi,  TYPE_PSI,  0 )
 
 #undef PLUGIN_CALLOUT_PEER_BUS