diff options
Diffstat (limited to 'src/import/chips/ocmb/explorer/procedures')
5 files changed, 38 insertions, 7 deletions
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scrub.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scrub.C index 2ea07e54e..ca588d8d2 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scrub.C +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_scrub.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2019 */ +/* Contributors Listed Below - COPYRIGHT 2019,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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" diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/dimm/exp_rank.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/dimm/exp_rank.H index d1ed24665..56dc34b4f 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/dimm/exp_rank.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/dimm/exp_rank.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2019 */ +/* Contributors Listed Below - COPYRIGHT 2019,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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 diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mc/exp_port.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mc/exp_port.H index 668d32bfd..568dbbbbc 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mc/exp_port.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mc/exp_port.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2019 */ +/* Contributors Listed Below - COPYRIGHT 2019,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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 { diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist.H index df3b9af2a..13dd0ba6d 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2019 */ +/* Contributors Listed Below - COPYRIGHT 2019,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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> diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H index 9b1186c07..0afe9618e 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/mcbist/exp_mcbist_traits.H @@ -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 { |
