diff options
| author | Luke Mulkey <lwmulkey@us.ibm.com> | 2018-03-19 10:28:37 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2018-04-13 11:07:00 -0400 |
| commit | afb0e6a438eeda79822dd1dde73b98e6a87fde5b (patch) | |
| tree | 7f412cf4f6bb91d7c8fc944c976b40bc8ef1ed9a /src/import | |
| parent | 0c5b62c1df484f4fd6549f1ba9420a8e24791d9f (diff) | |
| download | talos-hostboot-afb0e6a438eeda79822dd1dde73b98e6a87fde5b.tar.gz talos-hostboot-afb0e6a438eeda79822dd1dde73b98e6a87fde5b.zip | |
Add unmask errors back to cen_framelock
Change-Id: Ia05fadcd6676f2c076bad14002d6afc26953aaf9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56027
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: LUCAS W. MULKEY <lwmulkey@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56037
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.C | 4 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.mk | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.C b/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.C index fde7643fe..d1d7b47b7 100644 --- a/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.C +++ b/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.C @@ -43,6 +43,7 @@ #include <p9_cen_framelock.H> #include <p9_mc_scom_addresses.H> #include <cen_gen_scom_addresses.H> +#include <p9c_mss_unmask_errors.H> fapi2::ReturnCode p9_cen_framelock_cloned(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& i_pu_target, const fapi2::Target<fapi2::TARGET_TYPE_MEMBUF_CHIP>& i_mem_target, @@ -1497,7 +1498,6 @@ fapi_try_exit: // // - //------------------------------------------------------------------------------ fapi2::ReturnCode p9_cen_framelock(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& i_pu_target, const fapi2::Target<fapi2::TARGET_TYPE_MEMBUF_CHIP>& i_mem_target, @@ -1509,7 +1509,7 @@ fapi2::ReturnCode p9_cen_framelock(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& // it will commit the passed in rc (if non-zero), and return it's own bad rc. // Else if mss_unmask_inband_errors runs clean, // it will just return the passed in rc. - //l_rc = mss_unmask_inband_errors(i_mem_target, l_rc); + FAPI_TRY(mss_unmask_inband_errors(i_mem_target)); fapi_try_exit: return fapi2::current_err; diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.mk b/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.mk index 44ef1c837..9f2c991e3 100644 --- a/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.mk +++ b/src/import/chips/p9/procedures/hwp/perv/p9_cen_framelock.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2017 +# Contributors Listed Below - COPYRIGHT 2017,2018 # [+] International Business Machines Corp. # # @@ -22,6 +22,16 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG +CEN_MSS_INCLUDES := $(GENPATH) +CEN_MSS_INCLUDES += $(ROOTPATH) +CEN_MSS_INCLUDES += $(ROOTPATH)/chips/centaur/common/include +CEN_MSS_INCLUDES += $(ROOTPATH)/chips/centaur/procedures/hwp/memory +CEN_MSS_INCLUDES += $(ROOTPATH)/chips/centaur/procedures/hwp/memory/lib +CEN_MSS_INCLUDES += $(ROOTPATH)/chips/centaur/procedures/hwp/memory/lib/shared +CEN_MSS_INCLUDES += $(ROOTPATH)/chips/centaur/procedures/hwp/initfiles/ + PROCEDURE=p9_cen_framelock +lib${PROCEDURE}_DEPLIBS=p9c_mss_unmask_errors $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/centaur/common/include) +$(eval $(call __ADD_MODULE_INCDIR,$(PROCEDURE),$(CEN_MSS_INCLUDES))) $(call BUILD_PROCEDURE) |
