From f11931ee5e44f37421455d97930536b57249a9c0 Mon Sep 17 00:00:00 2001 From: Louis Stermole Date: Wed, 5 Jun 2019 16:59:44 -0400 Subject: Add attr to control endian swap of OMI CFG reg data on Explorer Change-Id: I3834e170cbf1594ede6854cf23c1e6184e6357dd Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78411 Reviewed-by: STEPHEN GLANCY Reviewed-by: Mark Pizzutillo Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78468 Reviewed-by: Daniel M. Crowell Tested-by: Daniel M. Crowell --- .../explorer/procedures/hwp/memory/exp_inband.C | 39 ++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) (limited to 'src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_inband.C') diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_inband.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_inband.C index a18fa4ba1..4d2f89ffe 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_inband.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_inband.C @@ -127,10 +127,28 @@ fapi2::ReturnCode putOCCfg( const uint64_t i_cfgAddr, const fapi2::buffer& i_data) { + fapi2::Target FAPI_SYSTEM; uint32_t l_v = static_cast(i_data); std::vector l_wd; - forceLE(l_v, l_wd); - return fapi2::putMMIO(i_target, i_cfgAddr, 4, l_wd); + fapi2::ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL_Type l_endian; + + FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL, + FAPI_SYSTEM, l_endian)); + + if (l_endian == fapi2::ENUM_ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL_LITTLE_ENDIAN) + { + forceLE(l_v, l_wd); + } + else + { + forceBE(l_v, l_wd); + } + + FAPI_TRY( fapi2::putMMIO(i_target, i_cfgAddr, 4, l_wd) ); + +fapi_try_exit: + FAPI_DBG("Exiting with return code : 0x%08X...", (uint64_t) fapi2::current_err); + return fapi2::current_err; } @@ -397,11 +415,26 @@ fapi2::ReturnCode getOCCfg( const uint64_t i_cfgAddr, fapi2::buffer& o_data) { + fapi2::Target FAPI_SYSTEM; uint32_t l_rd = 0; std::vector l_data(4); uint32_t l_idx = 0; + fapi2::ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL_Type l_endian; + + FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL, + FAPI_SYSTEM, l_endian)); + FAPI_TRY(fapi2::getMMIO(i_target, i_cfgAddr, 4, l_data)); - readLE(l_data, l_idx, l_rd); + + if (l_endian == fapi2::ENUM_ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL_LITTLE_ENDIAN) + { + readLE(l_data, l_idx, l_rd); + } + else + { + readBE(l_data, l_idx, l_rd); + } + o_data = l_rd; fapi_try_exit: FAPI_DBG("Exiting with return code : 0x%08X...", (uint64_t) fapi2::current_err); -- cgit v1.2.1