PRD:Fir action update.

Based on ver85 of ras spreadsheet, updating action for following bit.
    - COREFIR[54]
    - TP_LFIR[36]

Change-Id: Ib7580c4dbf8e2a91d3521af82dfbe1a3364be25a
CQ:SW266657
Backport: release-fips811
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12080
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12247
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 96 insertions, 15 deletions

diff --git a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
index 421937584..e11618558 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Ex.rule
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2014
+# [+] 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.
@@ -844,6 +846,41 @@ chip Ex
         capture     group PllFIRs;
     };
 
+    ############################################################################
+    # Core registers for FFDC
+    ############################################################################
+
+    register EX_FREQ_CTRL_REG
+    {
+        name        "EX.TP_PCB_SLAVE_PM_INST.FREQ_CTRL_REG";
+        scomaddr    0x100F0151;
+        capture     group default;
+        access      read_only;
+    };
+
+    register EX_DPLL_STATUS_REG
+    {
+        name        "EX.TP_PCB_SLAVE_PM_INST.PCBS_DPLL_STAT_REG";
+        scomaddr    0x100F0161;
+        capture     group default;
+        access      read_only;
+    };
+
+    register EX_POWER_MGMT_STATUS_REG
+    {
+        name        "EX.TP_PCB_SLAVE_PM_INST.PCBS_PWR_MGMT_STAT_REG";
+        scomaddr    0x100F0153;
+        capture     group default;
+        access      read_only;
+    };
+
+    register EX_POWER_MGMT_CTRL_REG
+    {
+        name        "EX.TP_PCB_SLAVE_PM_INST.PCBS_PWR_MGMT_CTRL_REG";
+        scomaddr    0x100F0159;
+        capture     group default;
+        access      read_only;
+    };
 
 };
 
@@ -1018,7 +1055,6 @@ rule CoreFir
     RECOVERABLE: COREFIRWOF & ~COREFIR_MASK & ~COREFIR_ACT0 &  COREFIR_ACT1;
 };
 
-#Based on RAS SpreadSheet p8dd1_mss_FFDC_72.xls
 group gCoreFir filter singlebit
 {
     /** COREFIR[0]
@@ -1297,7 +1333,7 @@ group gCoreFir filter singlebit
     /** COREFIR[54]
      *  AMBI_HANG_DETECT: Hang detected unknown source
      */
-    (CoreFir, bit(54)) ? calloutExAndSecLvlThr1NoGard;
+    (CoreFir, bit(54)) ? SelfHighThr1;
 
     /** COREFIR[55]
      *  NEST_HANG_DETECT: External Hang detected
@@ -2052,14 +2088,6 @@ actionclass calloutExThr32pDay
     SelfMedThr32PerDay;
 };
 
-/** callout Ex,Sec Level on first instance ,initiate core dump,
- *  garding not done */
-actionclass calloutExAndSecLvlThr1NoGard
-{
-    calloutSelfAndLevel2MedThr1;
-    gard(NoGard);
-};
-
 actionclass calloutExLowSecLvlThr1MedDumpSh
 {
     SelfLowLevel2MedThr1;
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule
index e09747e65..c36220efc 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2014
+# [+] 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.
@@ -1241,14 +1243,13 @@ actionclass maskTodError
     funccall("todNewTopologyIfBackupMDMT");
 };
 
-/** callout the master core of the Proc, no gard */
+/** callout the master core of the Proc */
 actionclass calloutMasterCoreThr1NoGard
 {
     funccall("calloutMasterCore");
     callout2ndLvlMed;
     threshold1;
     dumpSH;
-    gard(NoGard);
 };
 
 /**
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
index 03f091cc1..8a6ffb44a 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
+++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_regs_TP.rule
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2014
+# [+] 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.
@@ -387,4 +389,54 @@
         scomaddr    0x00040033;
         capture     group TODReg;
     };
+######################################################################
+#                 Registers for FFDC only
+######################################################################
+
+    register PMC_SPIV_STATUS_REG
+    {
+        name        "PMC_SPIV_STATUS_REG";
+        scomaddr    0x00062046;
+        access      read_only;
+        capture     group default;
+    };
+
+    register PMC_PSTATE_MONITOR_AND_CTRL_REG
+    {
+        name        "PMC_PSTATE_MONITOR_AND_CTRL_REG";
+        scomaddr    0x00062002;
+        access      read_only;
+        capture     group default;
+    };
+
+    register GLOBAL_ACTUAL_VOLTAGE_REG
+    {
+        name        "GLOBAL_ACTUAL_VOLTAGE_REG";
+        scomaddr    0x00062008;
+        access      read_only;
+        capture     group default;
+    };
+
+    register PMC_O2S_STATUS_REG
+    {
+        name        "PMC_O2S_STATUS_REG";
+        scomaddr    0x00062056;
+        access      read_only;
+        capture     group default;
+    };
+
+    register PMC_O2S_WDATA_REG
+    {
+        name        "PMC_O2S_WDATA_REG";
+        scomaddr    0x00062058;
+        access      read_only;
+        capture     group default;
+    };
 
+    register PMC_O2S_RDATA_REG
+    {
+        name        "PMC_O2S_RDATA_REG";
+        scomaddr    0x00062059;
+        access      read_only;
+        capture     group default;
+    };