PRD: Fabric CEs - threshold and mask but no callout

Change-Id: Ie501ac2dc456cd81bd65e5277d601cc64eda7b96
CQ: SW233772
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7137
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
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/7203

2 files changed, 29 insertions, 15 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 032c46600..e9810f67a 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
@@ -135,11 +135,6 @@ group gAbusLFir filter singlebit
 # based on p8dd1_mss_FFDC_37_ reviewd.xls
 ################################################################################
 
-#FIXME RTC 23127 We need to revisit the Firmware action
-#FabricBus_CE_With_Repair. Description is same as P7 but
-#it appears it may need change.This appilies to PBES FIR.
-#calloutAbus0InterfaceTh5 may need modification.
-
 rule PbesFir
 {
     CHECK_STOP:
@@ -522,14 +517,29 @@ actionclass calloutAbus1InterfaceTh1 { calloutAbus1Interface; threshold1; };
 /** Callout the ABUS 2 interface, threshold 1 */
 actionclass calloutAbus2InterfaceTh1 { calloutAbus2Interface; threshold1; };
 
-/** Callout the ABUS 0 interface, threshold 5 per day */
-actionclass calloutAbus0InterfaceTh5 { calloutAbus0Interface; threshold5pday; };
+/** Threshold 5 per day, mask but do not predictively callout ABUS 0 */
+actionclass calloutAbus0InterfaceTh5
+{
+    calloutAbus0Interface;
+    threshold5pday;
+    funccall("ClearServiceCallFlag");
+};
 
-/** Callout the ABUS 1 interface, threshold 5 per day */
-actionclass calloutAbus1InterfaceTh5 { calloutAbus1Interface; threshold5pday; };
+/** Threshold 5 per day, mask but do not predictively callout ABUS 1 */
+actionclass calloutAbus1InterfaceTh5
+{
+    calloutAbus1Interface;
+    threshold5pday;
+    funccall("ClearServiceCallFlag");
+};
 
-/** Callout the ABUS 2 interface, threshold 5 per day */
-actionclass calloutAbus2InterfaceTh5 { calloutAbus2Interface; threshold5pday; };
+/** Threshold 5 per day, mask but do not predictively callout ABUS 2 */
+actionclass calloutAbus2InterfaceTh5
+{
+    calloutAbus2Interface;
+    threshold5pday;
+    funccall("ClearServiceCallFlag");
+};
 
 /** Lane Repair: spare deployed - ABUS 0 */
 actionclass spareDeployed_abus0
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 5acfbb4da..940a882c4 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
@@ -729,29 +729,33 @@ actionclass maxSparesExceeded_xbus1
 actionclass tooManyBusErrors_xbus1
 { calloutXbus1InterfaceTh1; funccall("tooManyBusErrors_xbus1"); };
 
-/** Callout the XBUS 0 interface, threshold 5 per day */
+/** Threshold 5 per day, mask but do not predictively callout XBUS 0 */
 actionclass calloutXbus0InterfaceTh5pDay
 {
     calloutXbus0Interface;
     threshold5pday;
+    funccall("ClearServiceCallFlag");
 };
 
-/** Callout the XBUS 1 interface, threshold 5 per day */
+/** Threshold 5 per day, mask but do not predictively callout XBUS 1 */
 actionclass calloutXbus1InterfaceTh5pDay
 {
     calloutXbus1Interface;
     threshold5pday;
+    funccall("ClearServiceCallFlag");
 };
 
-/** Callout the XBUS 2 interface, threshold 5 per day */
+/** Threshold 5 per day, mask but do not predictively callout XBUS 2 */
 actionclass calloutXbus2InterfaceTh5pDay
 {   calloutXbus2Interface;
     threshold5pday;
+    funccall("ClearServiceCallFlag");
 };
 
-/** Callout the XBUS 3 interface, threshold 5 per day */
+/** Threshold 5 per day, mask but do not predictively callout XBUS 3 */
 actionclass calloutXbus3InterfaceTh5pDay
 {
     calloutXbus3Interface;
     threshold5pday;
+    funccall("ClearServiceCallFlag");
 };