diff options
| author | crgeddes <crgeddes@us.ibm.com> | 2016-05-16 14:01:55 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-05-18 09:58:29 -0400 |
| commit | fcff88962bd395638d6a566380e9c362c65593ff (patch) | |
| tree | 8935e0b54096a920a50063b81fb92d1a9637ce36 /src/usr/fapi2 | |
| parent | 05f9da1916ed21d567dbc05c9d85fe8674312c65 (diff) | |
| download | talos-hostboot-fcff88962bd395638d6a566380e9c362c65593ff.tar.gz talos-hostboot-fcff88962bd395638d6a566380e9c362c65593ff.zip | |
Re-enable building of poundv HWP in hostboot
To get a change to the HWP through the EKB we had to temporarily
disable the building of the get_poundv_bucket, this commit re-enables
the HWP and associated tests.
Change-Id: If907aaab57eacb189abcc7ec435f7380999b8837
RTC:153882
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24612
Reviewed-by: Steven B. Janssen <janssens@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2')
| -rw-r--r-- | src/usr/fapi2/attribute_service.C | 64 | ||||
| -rwxr-xr-x | src/usr/fapi2/makefile | 3 | ||||
| -rw-r--r-- | src/usr/fapi2/test/makefile | 2 |
3 files changed, 35 insertions, 34 deletions
diff --git a/src/usr/fapi2/attribute_service.C b/src/usr/fapi2/attribute_service.C index 3bcbcfd35..20e26efee 100644 --- a/src/usr/fapi2/attribute_service.C +++ b/src/usr/fapi2/attribute_service.C @@ -52,7 +52,7 @@ #include <devicefw/driverif.H> #include <plat_attr_override_sync.H> #include <vpd/spdenums.H> -#include <p9_pm_get_poundv_bucket.H> +#include <p9_pm_get_poundv_bucket_attr.H> #include <errl/errlmanager.H> #include <targeting/common/targetservice.H> @@ -391,38 +391,38 @@ ReturnCode platGetFusedCoreMode(uint8_t & o_isFused) return fapi2::ReturnCode(); } -//****************************************************************************** +// ****************************************************************************** // fapi2::platAttrSvc::platGetPoundVBucketData function -//****************************************************************************** -// ReturnCode platGetPoundVBucketData(const Target<TARGET_TYPE_EQ>& i_fapiTarget, -// uint8_t * o_poundVData) -// { -// fapi2::ReturnCode rc; -// if(i_fapiTarget.getType() != TARGET_TYPE_EQ) -// { -// /*@ -// * @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE -// * @moduleid fapi2::MOD_FAPI2_MVPD_ACCESS -// * @reasoncode RC_INCORRECT_TARGET -// * @userdata1 Actual Target Type -// * @userdata2 Expected Target Type -// * @devdesc Attempted to read attribute from wrong target type -// * @custdesc Firmware Error -// */ -// errlHndl_t l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, -// MOD_FAPI2_MVPD_ACCESS, -// RC_INCORRECT_TARGET, -// i_fapiTarget.getType(), -// TARGET_TYPE_EQ, -// true); -// rc.setPlatDataPtr(reinterpret_cast<void *> (l_errl)); -// } -// else -// { -// rc = p9_pm_get_poundv_bucket_attr(i_fapiTarget,o_poundVData); -// } -// return rc; -// } +// ****************************************************************************** +ReturnCode platGetPoundVBucketData(const Target<TARGET_TYPE_EQ>& i_fapiTarget, + uint8_t * o_poundVData) +{ + fapi2::ReturnCode rc; + if(i_fapiTarget.getType() != TARGET_TYPE_EQ) + { + /*@ + * @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE + * @moduleid fapi2::MOD_FAPI2_MVPD_ACCESS + * @reasoncode RC_INCORRECT_TARGET + * @userdata1 Actual Target Type + * @userdata2 Expected Target Type + * @devdesc Attempted to read attribute from wrong target type + * @custdesc Firmware Error + */ + errlHndl_t l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, + MOD_FAPI2_MVPD_ACCESS, + RC_INCORRECT_TARGET, + i_fapiTarget.getType(), + TARGET_TYPE_EQ, + true); + rc.setPlatDataPtr(reinterpret_cast<void *> (l_errl)); + } + else + { + rc = p9_pm_get_poundv_bucket_attr(i_fapiTarget,o_poundVData); + } + return rc; +} diff --git a/src/usr/fapi2/makefile b/src/usr/fapi2/makefile index 6ad102c76..c9cdbe759 100755 --- a/src/usr/fapi2/makefile +++ b/src/usr/fapi2/makefile @@ -48,7 +48,8 @@ include ${ROOTPATH}/src/import/tools/build/common.dir/script.rules.mk include ${ROOTPATH}/src/import/hwpf/fapi2/tools/parseErrorInfo.mk include ${ROOTPATH}/src/import/hwpf/fapi2/tools/parseAttributeInfo.mk include ${ROOTPATH}/src/import/hwpf/fapi2/tools/createIfAttrService.mk -# include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket.mk +include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket.mk +include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket_attr.mk include ${ROOTPATH}/config.mk diff --git a/src/usr/fapi2/test/makefile b/src/usr/fapi2/test/makefile index e3c974eef..472c748e4 100644 --- a/src/usr/fapi2/test/makefile +++ b/src/usr/fapi2/test/makefile @@ -51,7 +51,7 @@ TESTS += fapi2GetChildrenTest.H TESTS += fapi2BasicTryTest.H TESTS += fapi2GetOtherEndTest.H TESTS += fapi2SpdTestCxx.H -# TESTS += fapi2MvpdTestCxx.H +TESTS += fapi2MvpdTestCxx.H include ${ROOTPATH}/config.mk |
