Update SBE FIFO to the latest SBE HB spec (1.3a)

Add sbe_sp_intf.H from SBE repository to include SBE variables from SBE

Change-Id: I49aa987ab4b81b94939791571f005aa29338b36e
RTC: 169436
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36560
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 7 insertions, 48 deletions

diff --git a/src/usr/sbeio/sbe_fifodd.C b/src/usr/sbeio/sbe_fifodd.C
index dffcd3d44..87da46425 100644
--- a/src/usr/sbeio/sbe_fifodd.C
+++ b/src/usr/sbeio/sbe_fifodd.C
@@ -42,7 +42,7 @@
 #include <initservice/initserviceif.H>
 #include <kernel/pagemgr.H>
 #include <fapi2.H>
-#include <error_info_defs.H>
+#include <sbeio/sbe_sp_intf.H>
 
 extern trace_desc_t* g_trac_sbeio;
 
@@ -464,8 +464,8 @@ errlHndl_t SbeFifo::readResponse(TARGETING::Target * i_target,
         uint32_t * l_pStatusTmp = l_pReceived - l_last; //do word ptr math
         statusHeader * l_pStatusHeader = (statusHeader *)l_pStatusTmp;
         if ((FIFO_STATUS_MAGIC != l_pStatusHeader->magic) ||
-            (FIFO_PRI_OPERATION_SUCCESSFUL != l_pStatusHeader->primaryStatus) ||
-            (FIFO_SEC_OPERATION_SUCCESSFUL != l_pStatusHeader->secondaryStatus))
+            (SBE_PRI_OPERATION_SUCCESSFUL != l_pStatusHeader->primaryStatus) ||
+            (SBE_SEC_OPERATION_SUCCESSFUL != l_pStatusHeader->secondaryStatus))
         {
             SBE_TRACF(ERR_MRK "readResponse: failing downstream status "
                       " cmd=0x%08x magic=0x%08x prim=0x%08x secondary=0x%08x",
diff --git a/src/usr/sbeio/sbe_fifodd.H b/src/usr/sbeio/sbe_fifodd.H
index b328107e6..ba52dd6f0 100644
--- a/src/usr/sbeio/sbe_fifodd.H
+++ b/src/usr/sbeio/sbe_fifodd.H
@@ -28,7 +28,7 @@
 
 /**
  * @file sbe_fifodd.H
- * @brief SBE service provider declariation
+ * @brief SBE service provider declaration
  */
 
 #include <stdint.h>
@@ -37,6 +37,7 @@
 
 #include <errl/errlentry.H>
 #include <util/singleton.H>
+#include <error_info_defs.H>
 
 namespace SBEIO
 {
@@ -173,10 +174,8 @@ class SbeFifo
         struct fifoPutScomResponse
         {
             statusHeader status;
-            uint32_t     pcbpibStatus;    // only present on errors
-            // ffdc will go here on errors
+            struct       fapi2::ffdc_struct ffdc;  // ffdc data
             uint32_t     status_distance; // distance to status
-            uint32_t     EOT;             // dummy EOT word to ignore
             fifoPutScomResponse() {}
         } PACKED;
 
@@ -190,52 +189,12 @@ class SbeFifo
         {
             uint64_t     data;          // Data (0..31) + (32..63)
             statusHeader status;
-            uint32_t     pcbpibStatus;    // only present on errors
-            // ffdc will go here on errors
+            struct       fapi2::ffdc_struct ffdc;  // ffdc data
             uint32_t     status_distance; // distance to status
-            uint32_t     EOT;             // dummy EOT word to ignore
             fifoGetScomResponse() {}
         } PACKED;
 
         /**
-         * @brief enums for primary SBE response
-         *
-        */
-        enum sbePrimResponse
-        {
-            FIFO_PRI_OPERATION_SUCCESSFUL        = 0x00,
-            FIFO_PRI_INVALID_COMMAND             = 0x01,
-            FIFO_PRI_INVALID_DATA                = 0x02,
-            FIFO_PRI_SEQUENCE_ERROR              = 0x03,
-            FIFO_PRI_INTERNAL_ERROR              = 0x04,
-            FIFO_PRI_GENERIC_EXECUTION_FAILURE   = 0xFE,
-        };
-
-        /**
-         * @brief enums for secondary SBE response
-         *
-        */
-        enum sbeSecondaryResponse
-        {
-            FIFO_SEC_OPERATION_SUCCESSFUL              = 0x00,
-            FIFO_SEC_COMMAND_CLASS_NOT_SUPPORTED       = 0x01,
-            FIFO_SEC_COMMAND_NOT_SUPPORTED             = 0x02,
-            FIFO_SEC_INVALID_ADDRESS_PASSED            = 0x03,
-            FIFO_SEC_INVALID_TARGET_TYPE_PASSED        = 0x04,
-            FIFO_SEC_INVALID_TARGET_ID_PASSED          = 0x05,
-            FIFO_SEC_SPECIFIED_TARGET_NOT_PRESENT      = 0x06,
-            FIFO_SEC_SPECIFIED_TARGET_NOT_FUNCTIONAL   = 0x07,
-            FIFO_SEC_COMMAND_NOT_ALLOWED_IN_THIS_STATE = 0x08,
-            FIFO_SEC_FUNCTIONALITY_NOT_SUPPORTED       = 0x09,
-            FIFO_SEC_GENERIC_FAILURE_IN_EXECUTION      = 0x0A,
-            FIFO_SEC_BACKLISTED_ACCESS                 = 0x0B,
-            FIFO_SEC_OS_FAILURE                        = 0x0C,
-            FIFO_SEC_FIFO_ACCESS_FAILURE               = 0x0D,
-            FIFO_SEC_INSUFFICIENT_DATA_PASSED          = 0x0E,
-            FIFO_SEC_EXCESS_DATA_PASSED                = 0x0F,
-        };
-
-        /**
          * @Brief perform SBE FIFO chip-op
          *
          * @param[in]  i_target        Target to access