Check for system checkstop for individual mpipl step

Change-Id: I0633a40a1c1f1b69be3e0c0db071adb9a5b9c6df
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61456
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
(cherry picked from commit 88b93b1f8c7c1dedb851c50e914be90838f46a7e)
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58618
Tested-by: Sachin Gupta <sgupta2m@in.ibm.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/sbefw/app/power/sbecmdmpipl.C b/src/sbefw/app/power/sbecmdmpipl.C
index 2951852f..d45803a3 100644
--- a/src/sbefw/app/power/sbecmdmpipl.C
+++ b/src/sbefw/app/power/sbecmdmpipl.C
@@ -91,7 +91,8 @@ ReturnCode startMpiplIstepsExecute(void)
     do
     {
         fapiRc = sbeExecuteIstep(SBE_ISTEP_MPIPL_START, minor);
-        if(fapiRc != FAPI2_RC_SUCCESS)
+        bool checkstop = isSystemCheckstop();
+        if((fapiRc != FAPI2_RC_SUCCESS) || checkstop)
         {
             SBE_ERROR(SBE_FUNC "Failed in StartMpipl Minor Isteps[%d]", minor);
             break;
@@ -116,21 +117,23 @@ ReturnCode continueMpiplIstepsExecute(const sbeRole i_sbeRole)
     #define SBE_FUNC " continueMpiplIstepsExecute "
     SBE_ENTER(SBE_FUNC);
     ReturnCode fapiRc = FAPI2_RC_SUCCESS;
- 
+
     // Loop through isteps
     for( auto istep : g_continuempipl_isteps )
     {
+        bool checkstop = false;
         for(uint8_t minor = istep[1]; minor <= istep[2]; minor++)
         {
             fapiRc = sbeExecuteIstep(istep[0], minor);
-            if(fapiRc != FAPI2_RC_SUCCESS)
+            checkstop = isSystemCheckstop();
+            if((fapiRc != FAPI2_RC_SUCCESS) || checkstop)
             {
                 SBE_ERROR(SBE_FUNC "Failed in Master ContinueMpipl Isteps "
                     "Major[%d] Minor[%d]", istep[0], minor);
                 break;
             }
         }
-        if(fapiRc != FAPI2_RC_SUCCESS)
+        if((fapiRc != FAPI2_RC_SUCCESS) || checkstop)
         {
             break;
         }