diff options
| author | CHRISTINA L. GRAVES <clgraves@us.ibm.com> | 2016-05-11 10:54:04 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2017-11-16 18:00:17 -0500 |
| commit | 3cb9bab7b62ac994ff08afa09b4b9ed873258cf5 (patch) | |
| tree | 243fcbe097aea84b8212c56b26fc47c1f514fcfd | |
| parent | bcef4f1931d8cd755b2185435cc8e67cfe143295 (diff) | |
| download | talos-hostboot-3cb9bab7b62ac994ff08afa09b4b9ed873258cf5.tar.gz talos-hostboot-3cb9bab7b62ac994ff08afa09b4b9ed873258cf5.zip | |
Changes in error handling to stop the read/write as soon as an error occurs
Change-Id: I9a9ee05840f8e22d4e0f4a104434764eba84e8c3
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24376
Tested-by: Jenkins Server
Tested-by: PPE CI
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49796
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C | 3 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C index 141f72eb0..4270aa000 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C @@ -113,6 +113,7 @@ extern "C" { } fapi_try_exit: + fapi2::ReturnCode saveError = fapi2::current_err; if ( fapi2::current_err && l_myAduFlag.getOperFailCleanup() ) { @@ -122,7 +123,7 @@ extern "C" { } FAPI_DBG("Exiting..."); - return fapi2::current_err; + return saveError; } } // extern "C" diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C index c41ca26be..214834377 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C @@ -94,6 +94,7 @@ extern "C" "Error from p9_adu_coherent_setup_registers"); fapi_try_exit: + fapi2::ReturnCode saveError = fapi2::current_err; //if an error has occurred, ADU is dirty, and instructed to clean up, //attempt to reset ADU and free lock (propogate rc of original fail) @@ -104,7 +105,7 @@ extern "C" } FAPI_DBG("Exiting..."); - return fapi2::current_err; + return saveError; } } // extern "C" |
