PRD: add extra signatures for Centaur

Change-Id: I0022912986ad18dc94026a31e831b9e11cac2a0e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57845
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57887
CI-Ready: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

5 files changed, 95 insertions, 94 deletions

diff --git a/src/usr/diag/prdf/common/plat/cen/cen_mba.rule b/src/usr/diag/prdf/common/plat/cen/cen_mba.rule
index 19dfe0c8c..25ef56c00 100644
--- a/src/usr/diag/prdf/common/plat/cen/cen_mba.rule
+++ b/src/usr/diag/prdf/common/plat/cen/cen_mba.rule
@@ -31,6 +31,9 @@ chip cen_mba
     dump        DUMP_CONTENT_HW;
     scomlen     64;
 
+.include "prdfMemExtraSig.H";
+.include "prdfCenMbaExtraSig.H";
+
  #############################################################################
  #                                                                           #
  #  ######                                                                   #
diff --git a/src/usr/diag/prdf/common/plat/cen/prdfCenMbaExtraSig.H b/src/usr/diag/prdf/common/plat/cen/prdfCenMbaExtraSig.H
new file mode 100644
index 000000000..f094dccb8
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/cen/prdfCenMbaExtraSig.H
@@ -0,0 +1,57 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/common/plat/cen/prdfCenMbaExtraSig.H $      */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2018                        */
+/* [+] 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.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __prdfCenMbaExtraSig_H
+#define __prdfCenMbaExtraSig_H
+
+#include <prdrSignatures.H>
+#include <prdfMemExtraSig.H>
+
+PRDR_ERROR_SIGNATURE(CmdComplete_ERROR, 0xeeee0000, "",
+                     "ERROR: command complete analysis failed" );
+
+PRDR_ERROR_SIGNATURE(MaintNCE_CTE,   0xbbbb0016, "", "Maint SOFT/INTER CTE");
+
+PRDR_ERROR_SIGNATURE(VcmBadSpare,     0xbbbb0022, "", "VCM: bad DRAM spare");
+PRDR_ERROR_SIGNATURE(VcmCmAndSpare,   0xbbbb0023, "",
+                     "VCM: Both spare and chip mark used");
+PRDR_ERROR_SIGNATURE(VcmCmAndSm,      0xbbbb0024, "",
+                     "VCM: Both symbol and chip mark used");
+
+PRDR_ERROR_SIGNATURE(DsdDramSpared,   0xbbbb0030, "", "DSD: DRAM spared");
+PRDR_ERROR_SIGNATURE(DsdBadSpare,     0xbbbb0031, "", "DSD: DRAM spare is bad");
+
+PRDR_ERROR_SIGNATURE(MnfgIplFail,    0xbbbb0050, "",
+                     "MNFG IPL Internal failure");
+
+PRDR_ERROR_SIGNATURE(TpsMarksUnavail, 0xbbbb0065, "",
+                     "TPS: No more marks available");
+PRDR_ERROR_SIGNATURE(TpsCmAndSpare, 0xbbbb0066, "",
+                     "TPS: Both spare and chip mark used");
+
+#endif // __prdfCenMbaExtraSig_H
+
+
+
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaExtraSig.H b/src/usr/diag/prdf/common/plat/mem/prdfMemExtraSig.H
index 527511d6b..836ff3af9 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaExtraSig.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemExtraSig.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaExtraSig.H $  */
+/* $Source: src/usr/diag/prdf/common/plat/mem/prdfMemExtraSig.H $         */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -23,42 +23,31 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-#ifndef __prdfCenMbaExtraSig_H
-#define __prdfCenMbaExtraSig_H
+#ifndef __prdfMemExtraSig_H
+#define __prdfMemExtraSig_H
 
 #include <prdrSignatures.H>
 
-PRDR_ERROR_SIGNATURE(MaintCmdComplete_ERROR, 0xeeee0000, "",
-                     "ERROR: maint cmd complete analysis failed" );
-
-PRDR_ERROR_SIGNATURE(StartVcmPhase1,  0xffff0000, "", "Starting VCM phase 1");
-PRDR_ERROR_SIGNATURE(StartVcmPhase2,  0xffff0001, "", "Starting VCM phase 2");
-PRDR_ERROR_SIGNATURE(StartDsdPhase1,  0xffff0002, "", "Starting DSD phase 1");
-PRDR_ERROR_SIGNATURE(StartDsdPhase2,  0xffff0003, "", "Starting DSD phase 2");
-PRDR_ERROR_SIGNATURE(StartTpsPhase1,  0xffff0004, "", "Starting TPS phase 1");
-PRDR_ERROR_SIGNATURE(StartTpsPhase2,  0xffff0005, "", "Starting TPS phase 2");
-PRDR_ERROR_SIGNATURE(EndTpsPhase2,    0xffff0006, "", "TPS Phase 2 completed");
+PRDR_ERROR_SIGNATURE(StartVcmPhase1, 0xffff0000, "", "VCM: Starting phase 1");
+PRDR_ERROR_SIGNATURE(StartVcmPhase2, 0xffff0001, "", "VCM: Starting phase 2");
+PRDR_ERROR_SIGNATURE(StartDsdPhase1, 0xffff0002, "", "DSD: Starting phase 1");
+PRDR_ERROR_SIGNATURE(StartDsdPhase2, 0xffff0003, "", "DSD: Starting phase 2");
+PRDR_ERROR_SIGNATURE(StartTpsPhase1, 0xffff0004, "", "TPS: Starting phase 1");
+PRDR_ERROR_SIGNATURE(StartTpsPhase2, 0xffff0005, "", "TPS: Starting phase 2");
+PRDR_ERROR_SIGNATURE(EndTpsPhase2,   0xffff0006, "", "TPS: Phase 2 completed");
 
 PRDR_ERROR_SIGNATURE(MaintUE,        0xffff0010, "", "Maintenance UE");
-PRDR_ERROR_SIGNATURE(MaintMPE,       0xffff0011, "", "Maintenance MPE");
-PRDR_ERROR_SIGNATURE(MaintHARD_CTE,  0xffff0012, "", "Maintenance HARD CTE");
-PRDR_ERROR_SIGNATURE(MaintSOFT_CTE,  0xffff0013, "", "Maintenance SOFT CTE");
-PRDR_ERROR_SIGNATURE(MaintINTER_CTE, 0xffff0014, "", "Maintenance INTER CTE");
-PRDR_ERROR_SIGNATURE(MaintRETRY_CTE, 0xffff0015, "", "Maintenance RETRY CTE");
-PRDR_ERROR_SIGNATURE(MaintNCE_CTE,   0xffff0016, "", "Maint SOFT/INTER CTE");
+PRDR_ERROR_SIGNATURE(MaintIUE,       0xffff0011, "", "Maintenance IUE");
+PRDR_ERROR_SIGNATURE(MaintMPE,       0xffff0012, "", "Maintenance MPE");
+PRDR_ERROR_SIGNATURE(MaintHARD_CTE,  0xffff0013, "", "Maintenance HARD CTE");
+PRDR_ERROR_SIGNATURE(MaintSOFT_CTE,  0xffff0014, "", "Maintenance SOFT CTE");
+PRDR_ERROR_SIGNATURE(MaintINTER_CTE, 0xffff0015, "", "Maintenance INTER CTE");
+PRDR_ERROR_SIGNATURE(MaintRETRY_CTE, 0xffff0016, "", "Maintenance RETRY CTE");
 
 PRDR_ERROR_SIGNATURE(VcmVerified,     0xffff0020, "", "VCM: verified");
 PRDR_ERROR_SIGNATURE(VcmFalseAlarm,   0xffff0021, "", "VCM: false alarm");
-PRDR_ERROR_SIGNATURE(VcmBadSpare,     0xffff0022, "", "VCM: bad DRAM spare");
-PRDR_ERROR_SIGNATURE(VcmCmAndSpare,   0xffff0023, "",
-                     "VCM: Both spare and chip mark used");
-PRDR_ERROR_SIGNATURE(VcmCmAndSm,      0xffff0024, "",
-                     "VCM: Both symbol and chip mark used");
-PRDR_ERROR_SIGNATURE(VcmFalseAlarmExceeded, 0xffff0025, "",
-                     "VCM: false alarm threshold exceeded");
-
-PRDR_ERROR_SIGNATURE(DsdDramSpared,   0xffff0030, "", "DSD: DRAM spared");
-PRDR_ERROR_SIGNATURE(DsdBadSpare,     0xffff0031, "", "DSD: DRAM spare is bad");
+PRDR_ERROR_SIGNATURE(VcmFalseAlarmTH, 0xffff0022, "", "VCM: false alarm threshold");
+PRDR_ERROR_SIGNATURE(AllDramRepairs,  0xffff002F, "", "all DRAM repairs used");
 
 PRDR_ERROR_SIGNATURE(RdrInternalFail,  0xffff0040, "", "RDR: Internal failure");
 PRDR_ERROR_SIGNATURE(RdrInvalidConfig, 0xffff0041, "", "RDR: Invalid config");
@@ -69,27 +58,21 @@ PRDR_ERROR_SIGNATURE(RdrRepairsUsed,   0xffff0043, "",
 PRDR_ERROR_SIGNATURE(RdrRepairUnavail, 0xffff0044, "",
                      "RDR: Repairs needed but unavailable");
 
-PRDR_ERROR_SIGNATURE(MnfgIplFail,    0xffff0050, "",
-                     "MNFG IPL Internal failure");
 PRDR_ERROR_SIGNATURE(MnfgIplHardCE,  0xffff0051, "", "MNFG IPL hard CE");
 PRDR_ERROR_SIGNATURE(MnfgIplDramCTE, 0xffff0052, "", "MNFG IPL DRAM CTE");
-PRDR_ERROR_SIGNATURE(MnfgIplRankCTE, 0xffff0053, "", "MNFG IPL half-rank CTE");
+PRDR_ERROR_SIGNATURE(MnfgIplRankCTE, 0xffff0053, "", "MNFG IPL rank CTE");
 PRDR_ERROR_SIGNATURE(MnfgIplDsCTE,   0xffff0054, "", "MNFG IPL DIMM CTE");
 
-PRDR_ERROR_SIGNATURE(TpsFalseAlarm,         0xffff0061, "", "TPS: false alarm");
-PRDR_ERROR_SIGNATURE(TpsFalseAlarmExceeded, 0xffff0062, "",
-                     "TPS: false alarm threshold exceeded");
-PRDR_ERROR_SIGNATURE(TpsSymbolMark, 0xffff0063, "", "TPS: symbol mark placed");
-PRDR_ERROR_SIGNATURE(TpsChipMark,   0xffff0064, "", "TPS: chip mark placed");
-PRDR_ERROR_SIGNATURE(TpsMarksUnavail, 0xffff0065, "",
-                     "TPS: No more marks available");
-PRDR_ERROR_SIGNATURE(TpsCmAndSpare, 0xffff0066, "",
-                     "TPS: Both spare and chip mark used");
+PRDR_ERROR_SIGNATURE(TpsFalseAlarm,   0xffff0061, "", "TPS: false alarm");
+PRDR_ERROR_SIGNATURE(TpsFalseAlarmTH, 0xffff0062, "", "TPS: false alarm threshold");
+PRDR_ERROR_SIGNATURE(TpsSymbolMark,   0xffff0063, "", "TPS: symbol mark placed");
+PRDR_ERROR_SIGNATURE(TpsChipMark,     0xffff0064, "", "TPS: chip mark placed");
 
 PRDR_ERROR_SIGNATURE(MnfgDramCte,   0xffff0070, "", "MNFG per DRAM CTE");
-PRDR_ERROR_SIGNATURE(MnfgHrCte,     0xffff0071, "", "MNFG per half-rank CTE");
+PRDR_ERROR_SIGNATURE(MnfgRankCte,   0xffff0071, "", "MNFG per rank CTE");
 PRDR_ERROR_SIGNATURE(MnfgDimmCte,   0xffff0072, "", "MNFG per DIMM CTE");
 PRDR_ERROR_SIGNATURE(MnfgTableFull, 0xffff0073, "", "MNFG CE table full");
 PRDR_ERROR_SIGNATURE(MnfgEntryCte,  0xffff0074, "", "MNFG CE table entry CTE");
 
-#endif // __prdfCenMbaExtraSig_H
+#endif // __prdfMemExtraSig_H
+
diff --git a/src/usr/diag/prdf/common/plat/mem/prdfP9McaExtraSig.H b/src/usr/diag/prdf/common/plat/mem/prdfP9McaExtraSig.H
index aa90e83d7..d076d4cd6 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfP9McaExtraSig.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfP9McaExtraSig.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -27,56 +27,13 @@
 #define __prdfP9McaExtraSig_H
 
 #include <prdrSignatures.H>
+#include <prdfMemExtraSig.H>
 
-PRDR_ERROR_SIGNATURE(StartVcmPhase1, 0xffff0000, "", "VCM: Starting phase 1");
-PRDR_ERROR_SIGNATURE(StartVcmPhase2, 0xffff0001, "", "VCM: Starting phase 2");
-PRDR_ERROR_SIGNATURE(StartDsdPhase1, 0xffff0002, "", "DSD: Starting phase 1");
-PRDR_ERROR_SIGNATURE(StartDsdPhase2, 0xffff0003, "", "DSD: Starting phase 2");
-PRDR_ERROR_SIGNATURE(StartTpsPhase1, 0xffff0004, "", "TPS: Starting phase 1");
-PRDR_ERROR_SIGNATURE(StartTpsPhase2, 0xffff0005, "", "TPS: Starting phase 2");
-PRDR_ERROR_SIGNATURE(EndTpsPhase2,   0xffff0006, "", "TPS: Phase 2 completed");
-
-PRDR_ERROR_SIGNATURE(MaintUE,        0xffff0010, "", "Maintenance UE");
-PRDR_ERROR_SIGNATURE(MaintIUE,       0xffff0011, "", "Maintenance IUE");
-PRDR_ERROR_SIGNATURE(MaintMPE,       0xffff0012, "", "Maintenance MPE");
-PRDR_ERROR_SIGNATURE(MaintHARD_CTE,  0xffff0013, "", "Maintenance HARD CTE");
-PRDR_ERROR_SIGNATURE(MaintSOFT_CTE,  0xffff0014, "", "Maintenance SOFT CTE");
-PRDR_ERROR_SIGNATURE(MaintINTER_CTE, 0xffff0015, "", "Maintenance INTER CTE");
-PRDR_ERROR_SIGNATURE(MaintRETRY_CTE, 0xffff0016, "", "Maintenance RETRY CTE");
-
-PRDR_ERROR_SIGNATURE(VcmVerified,     0xffff0020, "", "VCM: verified");
-PRDR_ERROR_SIGNATURE(VcmFalseAlarm,   0xffff0021, "", "VCM: false alarm");
-PRDR_ERROR_SIGNATURE(VcmFalseAlarmTH, 0xffff0022, "", "VCM: false alarm threshold");
-PRDR_ERROR_SIGNATURE(AllDramRepairs,  0xffff002F, "", "all DRAM repairs used");
-
-PRDR_ERROR_SIGNATURE(RdrInternalFail,  0xffff0040, "", "RDR: Internal failure");
-PRDR_ERROR_SIGNATURE(RdrInvalidConfig, 0xffff0041, "", "RDR: Invalid config");
-PRDR_ERROR_SIGNATURE(RdrScreenBadDqs,  0xffff0042, "",
-                     "RDR: DRAM repairs disabled and VPD found");
-PRDR_ERROR_SIGNATURE(RdrRepairsUsed,   0xffff0043, "",
-                     "RDR: All repairs used");
-PRDR_ERROR_SIGNATURE(RdrRepairUnavail, 0xffff0044, "",
-                     "RDR: Repairs needed but unavailable");
-
-PRDR_ERROR_SIGNATURE(MnfgIplHardCE,  0xffff0051, "", "MNFG IPL hard CE");
-PRDR_ERROR_SIGNATURE(MnfgIplDramCTE, 0xffff0052, "", "MNFG IPL DRAM CTE");
-PRDR_ERROR_SIGNATURE(MnfgIplRankCTE, 0xffff0053, "", "MNFG IPL rank CTE");
-PRDR_ERROR_SIGNATURE(MnfgIplDsCTE,   0xffff0054, "", "MNFG IPL DIMM CTE");
-
-PRDR_ERROR_SIGNATURE(TpsFalseAlarm,   0xffff0061, "", "TPS: false alarm");
-PRDR_ERROR_SIGNATURE(TpsFalseAlarmTH, 0xffff0062, "", "TPS: false alarm threshold");
-PRDR_ERROR_SIGNATURE(TpsSymbolMark,   0xffff0063, "", "TPS: symbol mark placed");
-PRDR_ERROR_SIGNATURE(TpsChipMark,     0xffff0064, "", "TPS: chip mark placed");
-PRDR_ERROR_SIGNATURE(TpsSymUeRisk,    0xffff0065, "", "TPS: placing symbol mark risks UE");
-PRDR_ERROR_SIGNATURE(TpsChipUeRisk,   0xffff0066, "", "TPS: placing chip mark risks UE");
-PRDR_ERROR_SIGNATURE(TpsPotentialUe,  0xffff0067, "", "TPS: potential UE");
-PRDR_ERROR_SIGNATURE(TpsDramDisabled, 0xffff0068, "", "TPS: DRAM repairs disabled");
-
-PRDR_ERROR_SIGNATURE(MnfgDramCte,   0xffff0070, "", "MNFG per DRAM CTE");
-PRDR_ERROR_SIGNATURE(MnfgRankCte,   0xffff0071, "", "MNFG per rank CTE");
-PRDR_ERROR_SIGNATURE(MnfgDimmCte,   0xffff0072, "", "MNFG per DIMM CTE");
-PRDR_ERROR_SIGNATURE(MnfgTableFull, 0xffff0073, "", "MNFG CE table full");
-PRDR_ERROR_SIGNATURE(MnfgEntryCte,  0xffff0074, "", "MNFG CE table entry CTE");
+PRDR_ERROR_SIGNATURE(TpsSymUeRisk,    0xaaaa0065, "", "TPS: placing symbol mark risks UE");
+PRDR_ERROR_SIGNATURE(TpsChipUeRisk,   0xaaaa0066, "", "TPS: placing chip mark risks UE");
+PRDR_ERROR_SIGNATURE(TpsPotentialUe,  0xaaaa0067, "", "TPS: potential UE");
+PRDR_ERROR_SIGNATURE(TpsDramDisabled, 0xaaaa0068, "", "TPS: DRAM repairs disabled");
 
 #endif // __prdfP9McaExtraSig_H
 
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mca.rule b/src/usr/diag/prdf/common/plat/p9/p9_mca.rule
index 9059460c8..dfd1568d2 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_mca.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_mca.rule
@@ -31,6 +31,7 @@ chip p9_mca
     dump        DUMP_CONTENT_HW;
     scomlen     64;
 
+.include "prdfMemExtraSig.H";
 .include "prdfP9McaExtraSig.H";
 
  #############################################################################