Fixing p9_pba_access.C to return FFDC for error from PBA status check

SBE team needs FFDC data to investigate defect SW388434.
This commit is to fix the lost of FFDC when there's an error with
PBA status check function.

Change-Id: Ib52f81ecec96308054e5b30dac15dbf9f8657214
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40713
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40714
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

src/import/chips/p9/procedures/hwp/nest/p9_pba_access.C

@@ -56,7 +56,7 @@ extern "C" {
                                     uint8_t io_data[])
     {
         //return codes
-        fapi2::ReturnCode rc1;
+        fapi2::ReturnCode l_statusRc = fapi2::FAPI2_RC_SUCCESS;
 
         // mark HWP entry
         FAPI_DBG("Entering ...\n");
@@ -84,23 +84,27 @@ extern "C" {
         //If we are not in fastmode or this is the last granule, we want to check the status
         if ( i_lastGranule || (l_myPbaFlag.getFastMode() == false) )
         {
-            rc1 = p9_pba_coherent_status_check(i_target);
+            l_statusRc = p9_pba_coherent_status_check(i_target);
 
+            // Clean up PBA regardless of status check returned value.
             if (i_lastGranule)
             {
                 //Clean up the PBA since it's the last read/write and it has been finished
                 FAPI_TRY(p9_pba_coherent_cleanup_pba(i_target),
                          "Error doing p9_pba_coherent_cleanup_pba");
             }
 
-            // No error at this point
-            // Set error to rc1 returned from status check
-            fapi2::current_err = rc1;
         }
 
         // mark HWP exit
     fapi_try_exit:
 
+        // If error from status check, return it for FFDC
+        if (l_statusRc)
+        {
+            fapi2::current_err = l_statusRc;
+        }
+
         //Handling error. PBA access is the main error if there's one.
         //Append the input data to an error if we got an error back for non-PPE env
 #ifndef __PPE__