diff options
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/memory/lib')
10 files changed, 13 insertions, 76 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H index 7cc82c5e5..62fc63bdf 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H @@ -42,7 +42,7 @@ #include <p9_mc_scom_addresses_fld.H> #include <generic/memory/lib/utils/scom.H> #include <lib/utils/num.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/shared/mss_const.H> #include <lib/phy/phy_cntrl.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C b/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C index 389a94551..fd9562ed7 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C @@ -43,7 +43,7 @@ #include <generic/memory/lib/utils/find.H> #include <lib/utils/assert_noexit.H> #include <lib/spd/spd_factory.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> using fapi2::TARGET_TYPE_DIMM; using fapi2::TARGET_TYPE_MCS; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C index 66086df35..54d5e8251 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C @@ -43,7 +43,7 @@ #include <lib/mcbist/address.H> #include <lib/mcbist/settings.H> #include <lib/mcbist/sim.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/utils/poll.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/sim.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/sim.C index 933676c48..01940ac3c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/sim.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/sim.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <lib/mcbist/mcbist.H> #include <lib/mcbist/patterns.H> #include <lib/mcbist/sim.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> using fapi2::TARGET_TYPE_MCBIST; using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C index b8aa9366e..225a25400 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C @@ -56,11 +56,11 @@ #include <lib/workarounds/dqs_align_workarounds.H> #include <lib/phy/mss_training.H> -#include <lib/utils/bit_count.H> +#include <generic/memory/lib/utils/bit_count.H> #include <generic/memory/lib/utils/find.H> #include <lib/utils/dump_regs.H> #include <generic/memory/lib/utils/scom.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/dimm/rank.H> #include <lib/shared/mss_const.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/mss_training.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/mss_training.C index e8ee65ad8..bfd51029a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/mss_training.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/mss_training.C @@ -51,7 +51,7 @@ #include <lib/workarounds/ccs_workarounds.H> #include <generic/memory/lib/utils/scom.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/dimm/rank.H> #include <lib/shared/mss_const.H> #include <lib/dimm/ddr4/pda.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.C b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.C index c56b78f5e..b381042a2 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -43,7 +43,7 @@ #include <lib/power_thermal/decoder.H> #include <generic/memory/lib/utils/find.H> #include <generic/memory/lib/utils/c_str.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/dimm/kind.H> #include <lib/shared/mss_const.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.H b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.H index cfca24008..ee432fd8d 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/decoder.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <fapi2.H> #include <mss.H> #include <lib/dimm/kind.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C index f602a709c..1cebe04ef 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/power_thermal/throttle.C @@ -38,7 +38,7 @@ // mss lib #include <lib/power_thermal/throttle.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <mss.H> using fapi2::TARGET_TYPE_MCA; using fapi2::TARGET_TYPE_MCS; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H deleted file mode 100644 index 530044704..000000000 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H +++ /dev/null @@ -1,63 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ -/* */ -/* IBM_PROLOG_END_TAG */ - -/// -/// @file count_dimm.H -/// @brief Count the DIMM attached to a target -/// -// *HWP HWP Owner: Stephen Glancy <sglancy@us.ibm.com> -// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com> -// *HWP Team: Memory -// *HWP Level: 3 -// *HWP Consumed by: HB:FSP - -#ifndef _MSS_COUNT_DIMM_H_ -#define _MSS_COUNT_DIMM_H_ - -#include <fapi2.H> -#include <generic/memory/lib/utils/find.H> -#include <generic/memory/lib/utils/c_str.H> - -namespace mss -{ -/// -/// @brief Return the count of the number of DIMM attached to a target -/// @tparam T the fapi2::TargetType -/// @param[in] i_target a target -/// @return size_t the count of DIMM attached -/// -template< fapi2::TargetType T > -inline size_t count_dimm(const fapi2::Target<T>& i_target) -{ - // Sanity check that we have DIMM. Be sure to ask the platform, not eff_config, as - // in the case of an over-ride and there are no DIMM in the config, we want to let - // people know. Which is how we found we needed to add this code ... - size_t l_dimm_count = find_targets<fapi2::TARGET_TYPE_DIMM>(i_target).size(); - FAPI_INF("%d DIMM on %s", l_dimm_count, mss::c_str(i_target)); - return l_dimm_count; -} - -} -#endif |