Skip to content

Commit

Permalink
Porting repair_state class and related functions
Browse files Browse the repository at this point in the history 
Cleaning up ported p9 code; fixing code beauty in exp_port_ut;
fixing lingering configure_wrq issues; cleaning up more ported p9
code; fixing include order errors in nvdimm; both p9 & exp build
cleanly; fixing 1R DIMM exclusion in explorer_mss_ut; fixing
bad call to cycle time with include order change; fixing exp_scrub
issue with cycle time; fixing exp UT fail

Change-Id: If88a5931c09e305aa115c367b54e2b586db37e58
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/87535
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89104
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: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@NicoFajardo @dcrowell77
NicoFajardo authored and dcrowell77 committed Jan 29, 2020
1 parent 3b5bb9f commit 5318cf7
Show file tree
Hide file tree
Showing 16 changed files with 822 additions and 728 deletions.
3 changes: 2 additions & 1 deletion src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scrub.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -35,6 +35,7 @@

#include <lib/shared/exp_defaults.H>
#include <exp_scrub.H>
#include <lib/utils/mss_exp_conversions.H>
#include <lib/mcbist/exp_memdiags.H>

extern "C"
Expand Down
31 changes: 30 additions & 1 deletion src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/dimm/exp_rank.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -114,6 +114,35 @@ inline size_t get_dimm_from_rank(const uint64_t i_rank)
return i_rank / TT::MAX_RANKS_PER_DIMM;
}

///
/// @brief Return a vector of rank numbers which represent the ranks for this dimm
/// @param[in] i_dimm_target TARGET_TYPE_DIMM
/// @param[out] o_ranks a vector of ranks for dimm (numbers)
/// @return FAPI2_RC_SUCCESS iff all is ok
///
template<>
inline fapi2::ReturnCode ranks_on_dimm_helper<mss::mc_type::EXPLORER>(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>&
i_dimm_target,
std::vector<uint64_t>& o_ranks)
{
std::vector<uint64_t> l_ranks;
std::vector<mss::rank::info<>> l_vect;

FAPI_TRY( mss::rank::ranks_on_dimm<mss::mc_type::EXPLORER>(i_dimm_target, l_vect) );

// Loop through and get ranks or each
for (const auto l_rank_info : l_vect)
{
l_ranks.push_back( l_rank_info.get_dimm_rank() );
}

o_ranks = l_ranks;

fapi_try_exit:
return fapi2::current_err;
}


} // namespace rank
} // namespace mss
#endif
5 changes: 3 additions & 2 deletions src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mc/exp_port.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -41,12 +41,13 @@
#include <explorer_scom_addresses_fld.H>
#include <explorer_scom_addresses_fld_fixes.H>
#include <lib/exp_attribute_accessors_manual.H>
#include <lib/utils/mss_exp_conversions.H>
#include <mss_explorer_attribute_getters.H>
#include <lib/shared/exp_consts.H>
#include <lib/dimm/exp_rank.H>
#include <generic/memory/lib/utils/mc/gen_mss_port.H>
#include <generic/memory/lib/utils/shared/mss_generic_consts.H>
#include <mss_generic_attribute_getters.H>
#include <mss_explorer_attribute_getters.H>

namespace mss
{
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -43,9 +43,9 @@

#include <lib/shared/exp_consts.H>
#include <lib/ecc/ecc_traits_explorer.H>
#include <lib/mcbist/exp_mcbist_traits.H>
#include <lib/mc/exp_port.H>
#include <lib/utils/mss_exp_conversions.H>
#include <lib/mcbist/exp_mcbist_traits.H>
#include <generic/memory/lib/utils/poll.H>
#include <generic/memory/lib/utils/memory_size.H>
#include <generic/memory/lib/utils/mcbist/gen_mss_mcbist_patterns.H>
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H
View file
Expand Up @@ -44,7 +44,7 @@
#include <lib/shared/exp_consts.H>
#include <generic/memory/lib/utils/shared/mss_generic_consts.H>
#include <generic/memory/lib/utils/mcbist/gen_mss_mcbist_address.H>
#include <generic/memory/lib/utils/mcbist/gen_mss_mcbist_traits.H>
#include <generic/memory/lib/utils/mcbist/gen_mss_mcbist.H>

namespace mss
{
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/nvdimm_utils.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018,2019 */
/* Contributors Listed Below - COPYRIGHT 2018,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -44,14 +44,14 @@
#include <lib/mc/mc.H>
#include <lib/dimm/rank.H>
#include <lib/mss_attribute_accessors.H>
#include <lib/mcbist/mcbist.H>
#include <lib/utils/mss_nimbus_conversions.H>
#include <generic/memory/lib/utils/poll.H>
#include <generic/memory/lib/utils/count_dimm.H>
#include <generic/memory/lib/utils/mc/gen_mss_port.H>
#include <lib/mcbist/address.H>
#include <lib/mcbist/memdiags.H>
#include <lib/mcbist/mcbist.H>
#include <lib/mcbist/settings.H>
#include <lib/utils/mss_nimbus_conversions.H>
#include <generic/memory/lib/utils/pos.H>
#include <lib/mc/port.H>
#include <lib/phy/dp16.H>
Expand Down
21 changes: 20 additions & 1 deletion src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2019 */
/* Contributors Listed Below - COPYRIGHT 2015,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -902,6 +902,25 @@ fapi_try_exit:
return fapi2::current_err;
}

///
/// @brief Return a vector of rank numbers which represent the ranks for this dimm
/// @param[in] i_dimm_target TARGET_TYPE_DIMM
/// @param[out] o_ranks a vector of ranks for dimm (numbers)
/// @return FAPI2_RC_SUCCESS iff all is ok
///
template<>
fapi2::ReturnCode ranks_on_dimm_helper<mss::mc_type::NIMBUS>(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>&
i_dimm_target,
std::vector<uint64_t>& o_ranks)
{
std::vector<uint64_t> l_ranks;
FAPI_TRY( mss::rank::ranks(i_dimm_target, l_ranks) );
o_ranks = l_ranks;

fapi_try_exit:
return fapi2::current_err;
}

} // namespace rank

} // namespace mss

0 comments on commit 5318cf7

Please sign in to comment.