PRD: separate UNIT_CS flag into PROC_CORE_CS and MEM_CHNL_FAIL

Change-Id: Ifa6a79a80a5fe5f3c44f4a99d83919e05fb948fb
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61323
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61594
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

2 files changed, 15 insertions, 11 deletions

diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
index 21355d8b4..4dee42977 100644
--- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
+++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
@@ -632,7 +632,8 @@ bool parsePfaData( void * i_buffer, uint32_t i_buflen,
         i_parser.PrintBool("  TRACKIT",                pfa.TRACKIT            );
         i_parser.PrintBool("  TERMINATE",              pfa.TERMINATE          );
         i_parser.PrintBool("  LOGIT",                  pfa.LOGIT              );
-        i_parser.PrintBool("  Unit CS",                pfa.UNIT_CHECKSTOP     );
+        i_parser.PrintBool("  Memory channel failure", pfa.MEM_CHNL_FAIL      );
+        i_parser.PrintBool("  Core unit checkstop",    pfa.PROC_CORE_CS       );
         i_parser.PrintBool("  Using Sync'd Saved Sdc", pfa.USING_SAVED_SDC    );
         i_parser.PrintBool("  Last Core Termination",  pfa.LAST_CORE_TERMINATE);
         i_parser.PrintBool("  Deferred Deconfig",      pfa.DEFER_DECONFIG     );
diff --git a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
index df47d1804..03f32acc6 100644
--- a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
+++ b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -160,12 +160,13 @@ struct PfaData
              TRACKIT              :1,
              TERMINATE            :1,
              LOGIT                :1,
-             UNIT_CHECKSTOP       :1,
+             MEM_CHNL_FAIL        :1,
+             PROC_CORE_CS         :1,
              USING_SAVED_SDC      :1,
              LAST_CORE_TERMINATE  :1,
              DEFER_DECONFIG       :1,
              SECONDARY_ERROR      :1,
-             Reserved             :18;
+             Reserved             :17;
 
     // Thresholding
     uint32_t errorCount :16, // Number of occurrences of this attention
@@ -210,12 +211,13 @@ struct PfaData
                     (i_right.TRACKIT              << 25) |
                     (i_right.TERMINATE            << 24) |
                     (i_right.LOGIT                << 23) |
-                    // FYI, two deprecated entries were removed. To make the
-                    // parser compatible with older or newer error logs, these
-                    // bits must remain a hole (i.e. it can be reused, but
+                    // FYI, one deprecated entry was removed. To make the
+                    // parser compatible with older or newer error logs, this
+                    // bit must remain a hole (i.e. it can be reused, but
                     // subsequent data must remain in the bit positions that
                     // they are currently in).
-                    (i_right.UNIT_CHECKSTOP       << 20) |
+                    (i_right.MEM_CHNL_FAIL        << 21) |
+                    (i_right.PROC_CORE_CS         << 20) |
                     (i_right.USING_SAVED_SDC      << 19) |
                     (i_right.LAST_CORE_TERMINATE  << 18) |
                     (i_right.DEFER_DECONFIG       << 17) |
@@ -264,11 +266,12 @@ struct PfaData
         i_right.TRACKIT             = (l_tmp[2] >> 25) & 0x01;
         i_right.TERMINATE           = (l_tmp[2] >> 24) & 0x01;
         i_right.LOGIT               = (l_tmp[2] >> 23) & 0x01;
-        // FYI, two deprecated entries were removed. To make the parser
-        // compatible with older or newer error logs, these bits must remain a
+        // FYI, one deprecated entry was removed. To make the parser
+        // compatible with older or newer error logs, this bit must remain a
         // hole (i.e. it can be reused, but subsequent data must remain in the
         // bit positions that they are currently in).
-        i_right.UNIT_CHECKSTOP      = (l_tmp[2] >> 20) & 0x01;
+        i_right.MEM_CHNL_FAIL       = (l_tmp[2] >> 21) & 0x01;
+        i_right.PROC_CORE_CS        = (l_tmp[2] >> 20) & 0x01;
         i_right.USING_SAVED_SDC     = (l_tmp[2] >> 19) & 0x01;
         i_right.LAST_CORE_TERMINATE = (l_tmp[2] >> 18) & 0x01;
         i_right.DEFER_DECONFIG      = (l_tmp[2] >> 17) & 0x01;