PRD: Removed gard resolution and made changes in procedure callout.

Parent commit incorporates ability to specify gard policy in callout resolution.
As a result, gard resolution became redundant and has been removed in this
commit. Also, gard policy associated with procedure callout has been set to
no gard.

Change-Id: I1ff9dedc301814847bbbda2e77ba4fe0a5417901
RTC: 103773
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14639
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15740
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

9 files changed, 100 insertions, 95 deletions

diff --git a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
index fa2b987b3..100227bab 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/CommonActions.rule
@@ -155,6 +155,10 @@ actionclass calloutDmiBusSymFru
 actionclass calloutSelfMedNoGard
 { callout(MRU_MED, NO_GARD); };
 
+/** Callout self with  low priority but don't gard it */
+actionclass calloutSelfLowNoGard
+{ callout(MRU_LOW, NO_GARD); };
+
 ################################################################################
 #                           Callouts with thresholds                           #
 ################################################################################
@@ -246,33 +250,31 @@ actionclass calloutSelfAndLevel2MedThr1
 };
 
 
-/** Callout 2nd level support of afer 32 events per day, no gard */
-actionclass callout2ndLvlMedThr32NoGard
+/** Callout 2nd level support of afer 32 events per day */
+actionclass callout2ndLvlMedThr32
 {
     callout2ndLvlMed;
     threshold32pday;
-    gard(NoGard);
 };
 
-/** Callout 2nd Level support on first occurrence, no gard */
-actionclass callout2ndLvlMedThr1NoGard
+/** Callout 2nd Level support on first occurrence */
+actionclass callout2ndLvlMedThr1
 {
     callout2ndLvlMed;
     threshold1;
-    gard(NoGard);
 };
 
-/** Callout 2nd Level Medium,  set SUE generation point, no gard */
-actionclass callout2ndLvlMedThr1UE_NoGard
+/** Callout 2nd Level Medium,  set SUE generation point*/
+actionclass callout2ndLvlMedThr1UE
 {
-    callout2ndLvlMedThr1NoGard;
+    callout2ndLvlMedThr1;
     SUEGenerationPoint;
 };
 
 /** Callout 2nd Level Medium, initiate SH dump */
 actionclass callout2ndLvlMedThr1dumpSh
 {
-    callout2ndLvlMedThr1NoGard;
+    callout2ndLvlMedThr1;
     dumpSH;
 };
 ################################################################################
@@ -296,16 +298,16 @@ actionclass dumpSW
 ################################################################################
 
 /** callout second lvl on first instance, initiaite SH dump */
-actionclass callout2ndLvlDumpShNoGard
+actionclass callout2ndLvlDumpSh
 {
-    callout2ndLvlMedThr1NoGard;
+    callout2ndLvlMedThr1;
     dumpSH;
 };
 
-/** Callout 2nd Level and dump SW , no garding*/
-actionclass callout2ndLvlDumpSwNoGard
+/** Callout 2nd Level and dump SW */
+actionclass callout2ndLvlDumpSw
 {
-    callout2ndLvlMedThr1NoGard;
+    callout2ndLvlMedThr1;
     dumpSW;
 };
 ################################################################################
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
index 90f4cd84c..8af77c687 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -1193,7 +1193,7 @@ group gCoreFir filter singlebit
     /** COREFIR[26]
      *  RECOV_IN_MAINT_ERR: 26 = recov_in_maint
      */
-    (CoreFir, bit(26)) ? callout2ndLvlMedThr1NoGard;
+    (CoreFir, bit(26)) ? callout2ndLvlMedThr1;
 
     /** COREFIR[27]
      *  DU_LOG_REC_ERR: logic recoverable error
@@ -1449,12 +1449,12 @@ group gL2Fir filter singlebit
     /** L2FIR[12]
      *  RC_POWERBUS_DATA_TIMEOUT
      */
-    (L2Fir, bit(12)) ? callout2ndLvlMedThr1NoGard;
+    (L2Fir, bit(12)) ? callout2ndLvlMedThr1;
 
     /** L2FIR[13]
      *  NCU_POWERBUS_DATA_TIMEOUT
      */
-    (L2Fir, bit(13)) ? callout2ndLvlMedThr1NoGard;
+    (L2Fir, bit(13)) ? callout2ndLvlMedThr1;
 
     /** L2FIR[14]
      *  HW_CONTROL_ERROR
@@ -2034,10 +2034,9 @@ actionclass calloutParentProcLow
  *  garding not required */
 actionclass SelfAndLevel2MedThr5PerHrNoGard
 {
-    calloutSelfMed;
+    calloutSelfMedNoGard;
     callout2ndLvlMed;
     threshold5phour;
-    gard(NoGard);
 };
 
 /** callouts Proc on first instance. Calls for second level support as well */
@@ -2053,8 +2052,8 @@ actionclass calloutProcLow2ndLvlMedThr1
  *  Set SUE flag, garding not done */
 actionclass calloutProcLow2ndLvlMedThr1SUE_NoGard
 {
-    calloutParentProcLow;
-    callout2ndLvlMedThr1NoGard;
+    callout(connected(TYPE_PROC),MRU_LOW, NO_GARD);
+    callout2ndLvlMedThr1;
     flag(SUE);
 };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
index 008b4f1cb..d29652f56 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Mcs.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -343,7 +343,7 @@ group gMciFir attntype CHECK_STOP, RECOVERABLE, SPECIAL, UNIT_CS
     /** MCIFIR[26]
      *  MCIFIRQ_POWERBUS_PROTOCOL_ERROR
      */
-    (MciFir, bit(26)) ? callout2ndLvlDumpSwNoGard;
+    (MciFir, bit(26)) ? callout2ndLvlDumpSw;
 
     /** MCIFIR[27]
      *  MCIFIRQ_MCS_COMMAND_LIST_TIMEOUT_DUE_TO_POWERBUS
@@ -381,7 +381,7 @@ group gMciFir attntype CHECK_STOP, RECOVERABLE, SPECIAL, UNIT_CS
     /** MCIFIR[33]
      *  MCIFIRQ_NONFOREIGN_ACCESS_TO_FOREIGN_BAR
      */
-    (MciFir, bit(33)) ? callout2ndLvlDumpSwNoGard;
+    (MciFir, bit(33)) ? callout2ndLvlDumpSw;
 
     /** MCIFIR[34]
      *  MCIFIRQ_CENTAUR_SYNC_COMMAND_DETECTED
@@ -406,12 +406,12 @@ group gMciFir attntype CHECK_STOP, RECOVERABLE, SPECIAL, UNIT_CS
     /** MCIFIR[38]
      *  MCIFIRQ_HA_ILLEGAL_CONSUMER_ACCESS_ERROR
      */
-    (MciFir, bit(38)) ? callout2ndLvlDumpSwNoGard;
+    (MciFir, bit(38)) ? callout2ndLvlDumpSw;
 
     /** MCIFIR[39]
      *  MCIFIRQ_HA_ILLEGAL_PRODUCER_ACCESS_ERROR
      */
-    (MciFir, bit(39)) ? callout2ndLvlDumpSwNoGard;
+    (MciFir, bit(39)) ? callout2ndLvlDumpSw;
 
     /** MCIFIR[40]
      *  CHANNEL TIMEOUT ERROR
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
index 927a84572..5892ef2df 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -450,9 +450,9 @@ actionclass calloutProcLevel2MedThr1
  *  and dump type SH, garding not done */
 actionclass calloutProcLevel2MedThr1dumpShNoGard
 {
-    calloutProcLevel2MedThr1;
+    calloutSelfLowNoGard;
+    callout2ndLvlMedThr1;
     dumpSH;
-    gard(NoGard);
 };
 
 /** callout Proc with low priority ,Sec level Med priority, Thr 32per day
@@ -463,7 +463,6 @@ actionclass calloutProcLevel2MedThr32dumpShNoGard
     callout2ndLvlMed;
     threshold32pday;
     dumpSH;
-    gard(NoGard);
 };
 
 actionclass calloutProcHighThr1SUE
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 bce8841d3..5b9486fcc 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
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -81,7 +83,7 @@ group gAbusLFir filter singlebit
     /** ABUS_LFIR[3]
      *  Local errors from CC (OPCG, parity, scan collision, ...)
      */
-    (AbusLFir, bit(3)) ? callout2ndLvlMedThr32NoGard;
+    (AbusLFir, bit(3)) ? callout2ndLvlMedThr32;
 
     /** ABUS_LFIR[4]
      *  Local errors from PSC (PCB error)
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 85acc0b4f..1668ce967 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
@@ -486,7 +486,7 @@ group gNxCqFir filter singlebit
     /** NXCQFIR[6]
      *  PowerBus data hang error
      */
-    (NxCqFir, bit(6)) ? callout2ndLvlMedThr1NoGard;
+    (NxCqFir, bit(6)) ? callout2ndLvlMedThr1;
 
     /** NXCQFIR[7]
      *  PowerBus command hang error
@@ -506,7 +506,7 @@ group gNxCqFir filter singlebit
     /** NXCQFIR[10]
      *  PowerBus miscellaneous error
      */
-    (NxCqFir, bit(10)) ? callout2ndLvlMedThr1NoGard;
+    (NxCqFir, bit(10)) ? callout2ndLvlMedThr1;
 
     /** NXCQFIR[11]
      *  MMIO BAR parity error
@@ -607,7 +607,7 @@ group gNxCxaFir filter singlebit
     /** NXCXAFIR[8]
      *  SNOOP_ARRAY_CE
      */
-    (NxCxaFir, bit(8)) ? callout2ndLvlMedThr32NoGard;
+    (NxCxaFir, bit(8)) ? callout2ndLvlMedThr32;
 
     /** NXCXAFIR[9]
      *  SNOOP_ARRAY_UE
@@ -712,12 +712,12 @@ group gNxCxaFir filter singlebit
     /** NXCXAFIR[29]
      *  LD_CLASS_CMD_ADDR_ERR
      */
-    (NxCxaFir, bit(29)) ? callout2ndLvlMedThr1NoGard;
+    (NxCxaFir, bit(29)) ? callout2ndLvlMedThr1;
 
     /** NXCXAFIR[30]
      *  ST_CLASS_CMD_ADDR_ERR
      */
-    (NxCxaFir, bit(30)) ? callout2ndLvlMedThr1NoGard;
+    (NxCxaFir, bit(30)) ? callout2ndLvlMedThr1;
 
     /** NXCXAFIR[31]
      *  PHB_LINK_DOWN
@@ -737,7 +737,7 @@ group gNxCxaFir filter singlebit
     /** NXCXAFIR[34]
      *  XPT_POWERBUS_CE
      */
-    (NxCxaFir, bit(34)) ? callout2ndLvlMedThr32NoGard;
+    (NxCxaFir, bit(34)) ? callout2ndLvlMedThr32;
 
     /** NXCXAFIR[35]
      *  XPT_POWERBUS_UE
@@ -1379,17 +1379,17 @@ group gPsiHbFir filter singlebit
     /** PSIHBFIR[10]
      *  PB_DATA_TIME_OUT
      */
-    (PsiHbFir, bit(10)) ? callout2ndLvlMedThr1NoGard;
+    (PsiHbFir, bit(10)) ? callout2ndLvlMedThr1;
 
     /** PSIHBFIR[11]
      *  PB_PARITY_ERROR
      */
-    (PsiHbFir, bit(11)) ? callout2ndLvlMedThr1NoGard;
+    (PsiHbFir, bit(11)) ? callout2ndLvlMedThr1;
 
     /** PSIHBFIR[12]
      *  FSP_ACCESS_TRUSTED_SPACE
      */
-    (PsiHbFir, bit(12)) ? callout2ndLvlMedThr1NoGard;
+    (PsiHbFir, bit(12)) ? callout2ndLvlMedThr1;
 
     /** PSIHBFIR[13]
      *  UNEXPECTED_PB
@@ -1682,17 +1682,17 @@ group gPbaFir filter singlebit
     /** PBAFIR[1]
      *  PBAFIR_PB_RDADRERR_FW
      */
-    (PbaFir, bit(1)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(1)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[2]
      *  PBAFIR_PB_RDDATATO_FW
      */
-    (PbaFir, bit(2)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(2)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[3]
      *  PBAFIR_PB_SUE_FW
      */
-    (PbaFir, bit(3)) ? callout2ndLvlMedThr32NoGard;
+    (PbaFir, bit(3)) ? callout2ndLvlMedThr32;
 
     /** PBAFIR[4]
      *  PBAFIR_PB_UE_FW
@@ -1702,22 +1702,22 @@ group gPbaFir filter singlebit
     /** PBAFIR[3:4]
      *  PBAFIR_PB_SUE_FW
      */
-    (PbaFir, bit(3,4)) ? callout2ndLvlMedThr32NoGard;
+    (PbaFir, bit(3,4)) ? callout2ndLvlMedThr32;
 
     /** PBAFIR[5]
      *  PBAFIR_PB_CE_FW
      */
-    (PbaFir, bit(5)) ? callout2ndLvlMedThr32NoGard;
+    (PbaFir, bit(5)) ? callout2ndLvlMedThr32;
 
     /** PBAFIR[6]
      *  PBAFIR_OCI_SLAVE_INIT
      */
-    (PbaFir, bit(6)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(6)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[7]
      *  PBAFIR_OCI_WRPAR_ERR
      */
-    (PbaFir, bit(7)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(7)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[8]
      *  PBAFIR_OCI_REREQTO
@@ -1727,37 +1727,37 @@ group gPbaFir filter singlebit
     /** PBAFIR[9]
      *  PBAFIR_PB_UNEXPCRESP
      */
-    (PbaFir, bit(9)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(9)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[10]
      *  PBAFIR_PB_UNEXPDATA
      */
-    (PbaFir, bit(10)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(10)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[11]
      *  PBAFIR_PB_PARITY_ERR
      */
-    (PbaFir, bit(11)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(11)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[12]
      *  PBAFIR_PB_WRADRERR_FW
      */
-    (PbaFir, bit(12)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(12)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[13]
      *  PBAFIR_PB_BADCRESP
      */
-    (PbaFir, bit(13)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(13)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[14]
      *  PBAFIR_PB_ACKDEAD_FW
      */
-    (PbaFir, bit(14)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(14)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[15]
      *  PBAFIR_PB_CRESPTO
      */
-    (PbaFir, bit(15)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(15)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[16:19]
      *  PBAFIR_BCUE
@@ -1777,12 +1777,12 @@ group gPbaFir filter singlebit
     /** PBAFIR[29]
      *  PBAFIR_ILLEGAL_CACHE_OP
      */
-    (PbaFir, bit(29)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(29)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[30]
      *  PBAFIR_OCI_BAD_REG_ADDR
      */
-    (PbaFir, bit(30)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(30)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[31:39]
      *  PBAFIR_AX
@@ -1792,7 +1792,7 @@ group gPbaFir filter singlebit
     /** PBAFIR[40]
      *  PBAFIR_PB_ACKDEAD_FW_WR
      */
-    (PbaFir, bit(40)) ? callout2ndLvlMedThr1NoGard;
+    (PbaFir, bit(40)) ? callout2ndLvlMedThr1;
 
     /** PBAFIR[41:43]
      *  RESERVED
@@ -2383,32 +2383,32 @@ group gPciNestFir filter singlebit
     /** PCINESTFIR_0[18]
      *  UNSOLICITIEDPBDATA
      */
-    (PciNestFir_0, bit(18)) ? callout2ndLvlMedThr1NoGard;
+    (PciNestFir_0, bit(18)) ? callout2ndLvlMedThr1;
 
     /** PCINESTFIR_1[18]
      *  UNSOLICITIEDPBDATA
      */
-    (PciNestFir_1, bit(18)) ? callout2ndLvlMedThr1NoGard;
+    (PciNestFir_1, bit(18)) ? callout2ndLvlMedThr1;
 
     /** PCINESTFIR_2[18]
      *  UNSOLICITIEDPBDATA
      */
-    (PciNestFir_2, bit(18)) ? callout2ndLvlMedThr1NoGard;
+    (PciNestFir_2, bit(18)) ? callout2ndLvlMedThr1;
 
     /** PCINESTFIR_0[19]
      *  UNEXPECTEDCRESP
      */
-    (PciNestFir_0, bit(19)) ? callout2ndLvlMedThr1NoGard;
+    (PciNestFir_0, bit(19)) ? callout2ndLvlMedThr1;
 
     /** PCINESTFIR_1[19]
      *  UNEXPECTEDCRESP
      */
-    (PciNestFir_1, bit(19)) ? callout2ndLvlMedThr1NoGard;
+    (PciNestFir_1, bit(19)) ? callout2ndLvlMedThr1;
 
     /** PCINESTFIR_2[19]
      *  UNEXPECTEDCRESP
      */
-    (PciNestFir_2, bit(19)) ? callout2ndLvlMedThr1NoGard;
+    (PciNestFir_2, bit(19)) ? callout2ndLvlMedThr1;
 
     /** PCINESTFIR_0[20]
      *  INVALIDCRESP
@@ -2928,20 +2928,28 @@ group gIomcFir_1 filter priority( 10, 18, 26, 34,   # Channel failure
 ################################################################################
 
 /** Callout the connected PCI 0 controller. */
-actionclass calloutConnPci0 { callout(connected(TYPE_PCI,0), MRU_MED); };
+actionclass calloutConnPci0NoGard
+{
+    callout(connected(TYPE_PCI,0), MRU_MED, NO_GARD);
+};
 
 /** Callout the connected PCI 1 controller. */
-actionclass calloutConnPci1 { callout(connected(TYPE_PCI,1), MRU_MED); };
+actionclass calloutConnPci1NoGard
+{
+    callout(connected(TYPE_PCI,1), MRU_MED, NO_GARD);
+};
 
 /** Callout the connected PCI 2 controller. */
-actionclass calloutConnPci2 { callout(connected(TYPE_PCI,2), MRU_MED); };
+actionclass calloutConnPci2NoGard
+{
+    callout(connected(TYPE_PCI,2), MRU_MED, NO_GARD);
+};
 
 /** Callout the connected PCI 0 controller, threshold 1 , no garding */
 actionclass calloutConnPci0Th1NoGard
 {
-    calloutConnPci0;
+    calloutConnPci0NoGard;
     threshold1;
-    gard(NoGard);
 };
 
 /** Callout the connected PCI 1 controller, threshold 1, no garding */
@@ -2954,33 +2962,29 @@ actionclass calloutConnPci1Th1NoGard
 /** Callout the connected PCI 2 controller, threshold 1, no garding */
 actionclass calloutConnPci2Th1NoGard
 {
-    calloutConnPci2;
+    calloutConnPci2NoGard;
     threshold1;
-    gard(NoGard);
 };
 
 /** Callout the connected PCI 0 controller, threshold 32 per day, no garding */
 actionclass calloutConnPci0Th32NoGard
 {
-    calloutConnPci0;
+    calloutConnPci0NoGard;
     threshold32pday;
-    gard(NoGard);
 };
 
 /** Callout the connected PCI 1 controller, threshold 32 per day, no garding */
 actionclass calloutConnPci1Th32NoGard
 {
-    calloutConnPci1;
+    calloutConnPci1NoGard;
     threshold32pday;
-    gard(NoGard);
 };
 
 /** Callout the connected PCI 2 controller, threshold 32 per day , no garding */
 actionclass calloutConnPci2Th32NoGard
 {
-    calloutConnPci2;
+    calloutConnPci2NoGard;
     threshold32pday;
-    gard(NoGard);
 };
 
 /** Callout the DMI bus 0 */
@@ -3182,7 +3186,7 @@ actionclass forceMpIpl
     #       in FW830.
     funccall("analyzeMpIPL");
     #dumpSH;
-    callout2ndLvlMedThr1NoGard;
+    callout2ndLvlMedThr1;
 };
 
 /** callout both ends of PSI Link.Threshold is 32 events per day.
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule
index 761960755..436013858 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PCIE.rule
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -102,7 +104,7 @@ group gPcieLFir filter singlebit
     /** PCIE_LFIR[3]
      *  Local errors from CC (OPCG, parity, scan collision, ...)
      */
-    (PcieLFir, bit(3)) ? callout2ndLvlMedThr32NoGard;
+    (PcieLFir, bit(3)) ? callout2ndLvlMedThr32;
 
     /** PCIE_LFIR[4]
      *  Local errors from PSC (PCB error)
@@ -286,7 +288,6 @@ actionclass calloutPhbClkA_0_noGard
 {
     funccall("calloutPhbClkA_0");
     threshold1;
-    gard(NoGard);
 };
 
 /**callout PHB associated with IOPCIFIR0 clkB, no garding */
@@ -294,7 +295,6 @@ actionclass calloutPhbClkB_0_noGard
 {
     funccall("calloutPhbClkB_0");
     threshold1;
-    gard(NoGard);
 };
 
 /**callout PHB associated with IOPCIFIR1 clkA, no garding */
@@ -302,7 +302,6 @@ actionclass calloutPhbClkA_1_noGard
 {
     funccall("calloutPhbClkA_1");
     threshold1;
-    gard(NoGard);
 };
 
 /**callout PHB associated with IOPCIFIR1 clkB, no garding */
@@ -310,7 +309,6 @@ actionclass calloutPhbClkB_1_noGard
 {
     funccall("calloutPhbClkB_1");
     threshold1;
-    gard(NoGard);
 };
 
 /** callout all PHB associated with IOPCIFIR0, no garding */
@@ -318,7 +316,6 @@ actionclass calloutPhbBothClks_0
 {
     funccall("calloutPhbBothClks_0");
     threshold1;
-    gard(NoGard);
 };
 
 /** callout all PHB associated with IOPCIFIR1, no garding */
@@ -326,6 +323,5 @@ actionclass calloutPhbBothClks_1
 {
     funccall("calloutPhbBothClks_1");
     threshold1;
-    gard(NoGard);
 };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C
index 07e1900c6..ba6e40da7 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -43,8 +45,8 @@ namespace CalloutUtil
 
 void defaultError( STEP_CODE_DATA_STRUCT & i_sc )
 {
-    i_sc.service_data->SetCallout( NextLevelSupport_ENUM );
-    i_sc.service_data->SetCallout( SP_CODE );
+    i_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_MED, NO_GARD );
+    i_sc.service_data->SetCallout( SP_CODE, MRU_MED, NO_GARD );
     i_sc.service_data->SetServiceCall();
 }
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
index e6a46ab8d..66f9e0191 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -820,7 +820,7 @@ int32_t calloutPhb( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & io_sc,
         }
         else if ( NULL != phbATrgt )
         {
-            io_sc.service_data->SetCallout( phbATrgt );
+            io_sc.service_data->SetCallout( phbATrgt, MRU_MED, PRDF::NO_GARD );
         }
     }
 
@@ -835,13 +835,14 @@ int32_t calloutPhb( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & io_sc,
         }
         else if ( (NULL != phbBTrgt) && (phbATrgt != phbBTrgt) )
         {
-            io_sc.service_data->SetCallout( phbBTrgt );
+            io_sc.service_data->SetCallout( phbBTrgt, MRU_MED, PRDF::NO_GARD );
         }
     }
 
     // If no PHBs called out, callout 2nd level support.
     if ( (SUCCESS != l_rc) || (0 == io_sc.service_data->getMruListSize()) )
-        io_sc.service_data->SetCallout( NextLevelSupport_ENUM );
+        io_sc.service_data->SetCallout( NextLevelSupport_ENUM,
+                                        MRU_MED, NO_GARD );
 
     return SUCCESS; // Intentionally returns SUCCESS so rule code does not get
                     // confused by undefined error code.