diff options
Diffstat (limited to 'src')
25 files changed, 51 insertions, 39 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/p9_mss_attr_update.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_attr_update.C index 28e240df8..b247d12d7 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_attr_update.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_attr_update.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ //------------------------------------------------------------------------------ #include <fapi2.H> #include <mss.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/shared/mss_const.H> #include <p9_mss_attr_update.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_bulk_pwr_throttles.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_bulk_pwr_throttles.C index 3253b7d61..17ebcba7e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_bulk_pwr_throttles.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_bulk_pwr_throttles.C @@ -38,7 +38,7 @@ #include <fapi2.H> #include <p9_mss_bulk_pwr_throttles.H> #include <generic/memory/lib/utils/find.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/power_thermal/throttle.H> using fapi2::TARGET_TYPE_MCS; diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_ddr_phy_reset.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_ddr_phy_reset.C index 732cfd270..be66a83fb 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_ddr_phy_reset.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_ddr_phy_reset.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <mss.H> #include <p9_mss_ddr_phy_reset.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/phy/adr32s.H> #include <lib/workarounds/dp16_workarounds.H> #include <lib/workarounds/dll_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C index 85780f996..0304b992a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,7 +37,7 @@ #include <mss.H> #include <p9_mss_draminit.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/utils/conversions.H> #include <lib/dimm/bcw_load.H> #include <lib/workarounds/dqs_align_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_mc.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_mc.C index 509db4d65..f1e42ffb5 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_mc.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_mc.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <p9_mss_draminit_mc.H> #include <lib/fir/unmask.H> #include <generic/memory/lib/utils/find.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/workarounds/mca_workarounds.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.C index ba15a905d..a3682dff6 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.C @@ -38,7 +38,7 @@ #include <vector> #include <p9_mss_draminit_training.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/shared/mss_const.H> #include <lib/workarounds/dp16_workarounds.H> #include <lib/workarounds/dqs_align_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training_adv.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training_adv.C index 8c3af9240..95a662883 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training_adv.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training_adv.C @@ -37,7 +37,7 @@ #include <vector> #include <p9_mss_draminit_training_adv.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/shared/mss_const.H> #include <lib/phy/dp16.H> #include <lib/phy/seq.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.C index e74dd5fbc..070b89139 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.C @@ -50,7 +50,7 @@ #include <lib/shared/mss_kind.H> #include <lib/dimm/eff_dimm.H> #include <lib/eff_config/plug_rules.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> /// /// @brief Configure the attributes for each controller diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C index bc1fa576a..50a046c1c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <lib/power_thermal/throttle.H> #include <lib/power_thermal/decoder.H> #include <lib/dimm/kind.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/shared/mss_const.H> #include <mss.H> extern "C" diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.C index a9bed597f..c767e87b7 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.C @@ -52,7 +52,7 @@ #include <lib/workarounds/freq_workarounds.H> #include <generic/memory/lib/utils/c_str.H> #include <generic/memory/lib/utils/find.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <generic/memory/lib/utils/index.H> #include <lib/shared/mss_const.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.C index ca7b90fd6..cba559c16 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.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 <p9_mss_freq_system.H> #include <generic/memory/lib/utils/find.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/freq/sync.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C index fdf0f5533..6c35c0502 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <lib/utils/poll.H> #include <generic/memory/lib/utils/find.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/mcbist/address.H> #include <lib/mcbist/memdiags.H> #include <lib/mcbist/mcbist.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C index d77bc4f32..cf8bc37c8 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <p9n_mca_scom.H> #include <p9n_mcbist_scom.H> #include <p9n_ddrphy_scom.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <generic/memory/lib/utils/find.H> #include <lib/phy/ddr_phy.H> #include <lib/mc/mc.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C index 10e09a14b..4ebaab6ac 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scrub.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -42,7 +42,7 @@ #include <lib/mcbist/patterns.H> #include <lib/mcbist/memdiags.H> #include <lib/mcbist/sim.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/fir/memdiags_fir.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C index eccd56532..364486242 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_utils_to_throttle.C @@ -48,7 +48,7 @@ #include <lib/utils/conversions.H> #include <lib/power_thermal/throttle.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/count_dimm.H> +#include <generic/memory/lib/utils/count_dimm.H> #include <lib/shared/mss_const.H> using fapi2::TARGET_TYPE_MCS; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H b/src/import/generic/memory/lib/utils/count_dimm.H index 530044704..87f54fb40 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H +++ b/src/import/generic/memory/lib/utils/count_dimm.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H $ */ +/* $Source: src/import/generic/memory/lib/utils/count_dimm.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -59,5 +59,17 @@ inline size_t count_dimm(const fapi2::Target<T>& i_target) return l_dimm_count; } +/// +/// @brief Return the count of the number of DIMM attached to a target - DIMM speicalization +/// @param[in] i_target a target +/// @return size_t the count of DIMM attached +/// +template< > +inline size_t count_dimm(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>& i_target) +{ + // You can only ever have one DIMM on a DIMM target + return 1; +} + } #endif |
