SBE FFDC structure update

Change-Id: Ib42eedf20ba0784d92988949eaa9e657c7d2653f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26397
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>

2 files changed, 59 insertions, 16 deletions

diff --git a/sbe/sbefw/sbeSpMsg.H b/sbe/sbefw/sbeSpMsg.H
index 3bb54c00..be0d26e3 100644
--- a/sbe/sbefw/sbeSpMsg.H
+++ b/sbe/sbefw/sbeSpMsg.H
@@ -1,3 +1,27 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: sbe/sbefw/sbeSpMsg.H $                                        */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* [+] 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                                                     */
 /*
  * @file: ppe/sbe/sbefw/sbeSpMsg.H
  *
@@ -124,8 +148,7 @@ typedef struct sbeResponseFfdc
 {
     uint32_t magicBytes:16;
     uint32_t lenInWords:16;  // length in word( 4 byte )
-    uint32_t hiFapiRc; // Unused since FAPI RC is 32 bit on the SBE
-    uint32_t lowFapiRc;
+    uint32_t fapiRc;
 
     /**
       * @brief set rc
@@ -136,7 +159,7 @@ typedef struct sbeResponseFfdc
       */
     void setRc(const uint32_t i_rc)
     {
-        lowFapiRc = i_rc;
+        fapiRc = i_rc;
     }
 
     /**
@@ -146,7 +169,7 @@ typedef struct sbeResponseFfdc
       */
     uint32_t getRc() const
     {
-        return lowFapiRc;
+        return fapiRc;
     }
 
     /**
@@ -162,10 +185,9 @@ typedef struct sbeResponseFfdc
         //TODO via 129076.
         //Need to change value for length once FFDC design is final.
         lenInWords  = ( sizeof(uint32_t )    // For magicBytes + lenInWords
-                        + sizeof(lowFapiRc) + sizeof(hiFapiRc) )
+                        + sizeof(fapiRc))
                            / sizeof(uint32_t);
-        lowFapiRc = 0;
-        hiFapiRc = 0;
+        fapiRc = 0;
     }
 }sbeResponseFfdc_t;
 
diff --git a/sbe/test/testCntlInstruction.py b/sbe/test/testCntlInstruction.py
index df0a9d46..76216a8b 100644
--- a/sbe/test/testCntlInstruction.py
+++ b/sbe/test/testCntlInstruction.py
@@ -1,3 +1,27 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: sbe/test/testCntlInstruction.py $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+# [+] 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
 import sys
 sys.path.append("targets/p9_nimbus/sbeTest" )
 import testUtil
@@ -232,24 +256,21 @@ INST_EXPDATA_ERR = [0xc0,0xde,0xa7,0x01,
 
 STOP_INST_EXPDATA_ERR_WTH_FFDC = [0xc0,0xde,0xa7,0x01,
                                   0x00,0xFE,0x00,0x0A,
-                                  0xFF,0xDC,0x00,0x03,
-                                  0x00,0x00,0x00,0x00,
+                                  0xFF,0xDC,0x00,0x02,
                                   0x00,0xCE,0xBC,0xB2,
-                                  0x00,0x00,0x00,0x06]
+                                  0x00,0x00,0x00,0x05]
 
 START_INST_EXPDATA_ERR_WTH_FFDC = [0xc0,0xde,0xa7,0x01,
                                   0x00,0xFE,0x00,0x0A,
-                                  0xFF,0xDC,0x00,0x03,
-                                  0x00,0x00,0x00,0x00,
+                                  0xFF,0xDC,0x00,0x02,
                                   0x00,0x25,0x64,0xDB,
-                                  0x00,0x00,0x00,0x06]
+                                  0x00,0x00,0x00,0x05]
 
 STEP_INST_EXPDATA_ERR_WTH_FFDC = [0xc0,0xde,0xa7,0x01,
                                   0x00,0xFE,0x00,0x0A,
-                                  0xFF,0xDC,0x00,0x03,
-                                  0x00,0x00,0x00,0x00,
+                                  0xFF,0xDC,0x00,0x02,
                                   0x00,0x0D,0x06,0x8E,
-                                  0x00,0x00,0x00,0x06]
+                                  0x00,0x00,0x00,0x05]
 
 # MAIN Test Run Starts Here...
 #-------------------------------------------------