1 files changed, 19 insertions, 51 deletions

diff --git a/src/sbefw/sbecmdparser.C b/src/sbefw/sbecmdparser.C
index 856a45f5..1b2235d0 100644
--- a/src/sbefw/sbecmdparser.C
+++ b/src/sbefw/sbecmdparser.C
@@ -61,23 +61,23 @@ static sbeCmdStruct_t g_sbeScomCmdArray [] =
 {
     {sbeGetScom,
      SBE_CMD_GETSCOM,
-     HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     HARDWARE_FENCED_STATE,
     },
     {sbePutScom,
      SBE_CMD_PUTSCOM,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     PUT_HARDWARE_FENCED_STATE,
     },
     {sbeModifyScom,
      SBE_CMD_MODIFYSCOM,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     PUT_HARDWARE_FENCED_STATE,
     },
     {sbePutScomUnderMask,
      SBE_CMD_PUTSCOM_MASK,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     PUT_HARDWARE_FENCED_STATE,
     },
     {sbeMultiScom,
      SBE_CMD_MULTISCOM,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     PUT_HARDWARE_FENCED_STATE,
     },
 };
 
@@ -90,18 +90,9 @@ static sbeCmdStruct_t g_sbeIplControlCmdArray [] =
     {sbeHandleIstep,
      SBE_CMD_EXECUTE_ISTEP,
      PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_RUNTIME|
-     SBE_FENCE_AT_DUMPING|SBE_FENCE_AT_QUIESCE,
-     // This is allowed in FFDC Collect state
+     SBE_FENCE_AT_DUMPING,
      // TODO - Issue 157287 - Allow MPIIPL in Isteps state
     },
-
-    {sbeContinueBoot,
-     SBE_CMD_CONTINUE_BOOT,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_RUNTIME|
-     SBE_FENCE_AT_DUMPING|SBE_FENCE_AT_ISTEP|
-     SBE_FENCE_AT_QUIESCE,
-     // This is allowed only in FFDC Collect State in PLCK mode
-    },
 };
 
 ////////////////////////////////////////////////////////////////
@@ -112,8 +103,7 @@ static sbeCmdStruct_t g_sbeGenericCmdArray [] =
 {
     {sbeGetCapabilities,
      SBE_CMD_GET_SBE_CAPABILITIES,
-     SBE_FENCE_AT_FFDC_COLLECT,
-     // Fence in FFDC Collect State, since it might over-write traces
+     SBE_NO_FENCE,
     },
 
      {sbeGetFfdc,
@@ -135,24 +125,22 @@ static sbeCmdStruct_t g_sbeMemoryAccessCmdArray [] =
 {
     {sbeGetMem,
      SBE_CMD_GETMEM,
-     HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     HARDWARE_FENCED_STATE,
     },
 
     {sbePutMem,
      SBE_CMD_PUTMEM,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     PUT_HARDWARE_FENCED_STATE,
     },
 
     {sbeGetOccSram,
      SBE_CMD_GETSRAM_OCC,
-     HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT|
-     SBE_FENCE_AT_QUIESCE,
+     HARDWARE_FENCED_STATE,
     },
 
     {sbePutOccSram,
      SBE_CMD_PUTSRAM_OCC,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT|
-     SBE_FENCE_AT_QUIESCE,
+     PUT_HARDWARE_FENCED_STATE,
     },
 };
 
@@ -164,7 +152,7 @@ static sbeCmdStruct_t g_sbeInstructionCntlCmdArray[] =
 {
     {sbeCntlInst,
      SBE_CMD_CONTROL_INSTRUCTIONS,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT,
+     PUT_HARDWARE_FENCED_STATE,
     },
 };
 
@@ -176,14 +164,12 @@ static sbeCmdStruct_t g_sbeRegAccessCmdArray [] =
 {
     {sbeGetReg,
      SBE_CMD_GETREG,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT|
-     SBE_FENCE_AT_QUIESCE,
+     PUT_HARDWARE_FENCED_STATE,
     },
 
     {sbePutReg,
      SBE_CMD_PUTREG,
-     PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_FFDC_COLLECT|
-     SBE_FENCE_AT_QUIESCE,
+     PUT_HARDWARE_FENCED_STATE,
     },
 };
 
@@ -196,19 +182,15 @@ static sbeCmdStruct_t g_sbeMpiplCmdArray[] =
     {sbeEnterMpipl,
      SBE_CMD_MPIPL_ENTER,
      PUT_HARDWARE_FENCED_STATE|SBE_FENCE_AT_ISTEP|
-     SBE_FENCE_AT_DUMPING|SBE_FENCE_AT_ABORT|
-     SBE_FENCE_AT_QUIESCE,
+     SBE_FENCE_AT_DUMPING,
      // Allow Fspless system to enter MPIPL
-     // Honour MPIPL at FFDC Collect state
      // Issue 157287
     },
 
     {sbeContinueMpipl,
      SBE_CMD_MPIPL_CONTINUE,
      HARDWARE_FENCED_STATE|SBE_FENCE_AT_ISTEP|
-     SBE_FENCE_AT_RUNTIME|SBE_FENCE_AT_DUMPING|
-     SBE_FENCE_AT_ABORT|SBE_FENCE_AT_FFDC_COLLECT|
-     SBE_FENCE_AT_QUIESCE,
+     SBE_FENCE_AT_RUNTIME|SBE_FENCE_AT_DUMPING,
      // Only allowed State is MPIPL
     },
 };
@@ -235,8 +217,7 @@ static sbeCmdStruct_t g_sbeCoreStateControlCmdArray [] =
      SBE_PSU_CMD_CONTROL_DEADMAN,
      SBE_FENCE_AT_CONTINUOUS_IPL|SBE_FENCE_AT_QUIESCE|
      SBE_FENCE_AT_MPIPL|SBE_FENCE_AT_ISTEP|
-     SBE_FENCE_AT_DUMPING|SBE_FENCE_AT_ABORT|
-     SBE_FENCE_AT_FFDC_COLLECT|SBE_FENCE_AT_QUIESCE,
+     SBE_FENCE_AT_DUMPING,
     },
 };
 
@@ -426,19 +407,6 @@ bool sbeIsCmdAllowedAtState (const uint8_t i_cmdClass,
                     // Reset is the only Option available
                     break;
 
-                case SBE_STATE_QUIESCE:
-                {
-                    l_ret = ((l_pCmd->cmd_state_fence &
-                             SBE_FENCE_AT_QUIESCE)? false:true);
-                    break;
-                }
-                case SBE_STATE_FFDC_COLLECT:
-                {
-                    l_ret = ((l_pCmd->cmd_state_fence &
-                             SBE_FENCE_AT_FFDC_COLLECT)? false:true);
-                    break;
-                }
-
                 case SBE_STATE_IPLING:
                 {
                     l_ret = ((l_pCmd->cmd_state_fence &
@@ -481,10 +449,10 @@ bool sbeIsCmdAllowedAtState (const uint8_t i_cmdClass,
                     break;
                 }
 
-                case SBE_STATE_ABORT:
+                case SBE_STATE_QUIESCE:
                 {
                     l_ret = ((l_pCmd->cmd_state_fence &
-                             SBE_FENCE_AT_ABORT)? false:true);
+                              SBE_FENCE_AT_QUIESCE)? false:true);
                     break;
                 }