diff options
| author | Andre Marin <aamarin@us.ibm.com> | 2017-02-03 04:00:10 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-10 22:00:32 -0500 |
| commit | 10c47be7297367f6e191dd043915b6e350a39fc8 (patch) | |
| tree | 67a14fe4aef73977d35441960c8a9a95ae922a14 /src/import/chips/p9/procedures/hwp | |
| parent | 20f6c12d57b302d7a384ec041461eb6f023e06a5 (diff) | |
| download | talos-hostboot-10c47be7297367f6e191dd043915b6e350a39fc8.tar.gz talos-hostboot-10c47be7297367f6e191dd043915b6e350a39fc8.zip | |
Add c_str generic API and update makefiles
Change-Id: I95e3b9013d3ab0c352d3614c12ee4ef0d26965d0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35924
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>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35952
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp')
47 files changed, 98 insertions, 152 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load.H index 9482de6fa..300e8c71c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/shared/mss_kind.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load_ddr4.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load_ddr4.C index 024923c04..0cc1c2f0d 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load_ddr4.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/bcw_load_ddr4.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,7 +36,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/conversions.H> #include <lib/eff_config/timing.H> #include <lib/ccs/ccs.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H index 093437e81..06d8b68c7 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ #include <p9_mc_scom_addresses.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/ccs/ccs.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H index 8e616c195..814efa968 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H @@ -38,7 +38,7 @@ #include <vector> #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/shared/mss_const.H> #include <lib/dimm/bcw_load_ddr4.H> #include <lib/phy/dp16.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.C index a97a9d073..2dd57df9d 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -35,7 +35,7 @@ #include <vector> #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/dimm/ddr4/mrs_load_ddr4.H> #include <lib/dimm/ddr4/latch_wr_vref.H> #include <lib/dimm/rank.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.H index 7853b5b12..9533d7e96 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/latch_wr_vref.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <vector> #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/dimm/mrs_load.H> #include <lib/dimm/ddr4/mrs_load_ddr4.H> #include <lib/eff_config/timing.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/mrs_load_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/mrs_load_ddr4.H index 6e4d141ba..f5807739e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/mrs_load_ddr4.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/mrs_load_ddr4.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,7 +38,7 @@ #include <vector> #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/dimm/mrs_load.H> #include <lib/eff_config/timing.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.C index 271513b20..3b73dec79 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.C @@ -34,7 +34,7 @@ // *HWP Consumed by: HB:FSP #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/dimm/ddr4/state_machine.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.H index 60fa5d9db..5190e9aff 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/state_machine.H @@ -37,7 +37,7 @@ #define _MSS_STATE_MACHINE_H_ #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/checker.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H index 3bb87d3cd..599ad98aa 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H index 6478a4c74..0bdc1045f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H @@ -39,7 +39,7 @@ #include <fapi2.H> #include <p9_mc_scom_addresses.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/shared/mss_kind.H> #include <lib/ccs/ccs.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H index d75d57732..c7c897e61 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/shared/mss_kind.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H index e504f35e9..4d3e73c2c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,7 @@ #include <p9_mc_scom_addresses.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H index 0e8c21f11..839be3f1b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/port.H @@ -44,8 +44,8 @@ #include <lib/shared/mss_const.H> #include <lib/utils/scom.H> -#include <lib/utils/c_str.H> #include <lib/dimm/rank.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H index 82e14e230..1ae8905d0 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -43,7 +43,7 @@ #include <lib/shared/mss_const.H> #include <lib/utils/scom.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/dimm/kind.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss.mk b/src/import/chips/p9/procedures/hwp/memory/lib/mss.mk index 9c62e8cc5..04e82c270 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mss.mk +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mss.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -40,6 +40,7 @@ MSS_SOURCE_DIRS := $(shell find $(MSS_PATH) -type d) define MSS_MODULE_INCLUDES $(foreach dir, $(MSS_SOURCE_DIRS), $(call ADD_MODULE_SRCDIR,$(1),$(dir))) $(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)/chips/p9/procedures/hwp/memory) +$(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)/generic/memory) $(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PATH)/include) $(call ADD_MODULE_INCDIR,$(1),$(GENPATH)) $(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PATH)/include) diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H b/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H index ac7be8a5e..fa0180616 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,6 +39,6 @@ //TK: what is this for? BRS #include <lib/utils/index.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #endif // _MSS_P9_ATTR_UTILS_H_ diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C index f74e31f3f..e2d72743f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,7 +36,7 @@ #include <fapi2.H> #include <lib/phy/apb.H> #include <lib/utils/scom.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/index.H> namespace mss diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C index 6d75f4b68..ba8e5d2ab 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C @@ -36,6 +36,7 @@ #include <fapi2.H> #include <utility> #include <vector> +#include <map> #include <p9_mc_scom_addresses.H> #include <p9_mc_scom_addresses_fld.H> @@ -48,7 +49,7 @@ #include <lib/dimm/rank.H> #include <lib/utils/scom.H> #include <lib/utils/pos.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/workarounds/dp16_workarounds.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C index 11ad78175..8f9e0e05f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,7 +36,7 @@ #include <fapi2.H> #include <lib/phy/phy_cntrl.H> #include <lib/utils/scom.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/index.H> #include <lib/mss_attribute_accessors.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C index 61f6b5ee4..7c866a182 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/seq.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,7 +36,7 @@ #include <fapi2.H> #include <lib/phy/seq.H> #include <lib/utils/scom.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/bit_count.H> #include <lib/eff_config/timing.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 e9bc4a3bb..a1d322197 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 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -42,7 +42,7 @@ #include <lib/power_thermal/throttle.H> #include <lib/power_thermal/decoder.H> #include <lib/utils/find.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/count_dimm.H> #include <lib/dimm/kind.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.C index 3f40e8719..9e195dd3f 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.C @@ -44,7 +44,7 @@ #include <lib/spd/rdimm/rdimm_decoder.H> #include <lib/spd/common/rcw_settings.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/find.H> using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.H b/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.H index f924f35e6..2cd744ae8 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder.H @@ -49,7 +49,7 @@ #include <lib/spd/common/rcw_settings.H> #include <lib/spd/rdimm/rdimm_decoder.H> #include <lib/spd/lrdimm/lrdimm_decoder.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder_v1_1.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder_v1_1.C index 3777bdf08..60913ebe1 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder_v1_1.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/common/spd_decoder_v1_1.C @@ -38,7 +38,7 @@ // mss lib #include <lib/spd/common/spd_decoder.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/conversions.H> #include <lib/utils/find.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_0.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_0.C index a6d0664e7..f8fc68e2c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_0.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_0.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -43,7 +43,7 @@ #include <lib/spd/lrdimm/lrdimm_decoder.H> #include <lib/spd/common/spd_decoder.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/find.H> using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_1.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_1.C index 56451f234..c2b38bd7a 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_1.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_1.C @@ -43,7 +43,7 @@ #include <lib/spd/lrdimm/lrdimm_decoder.H> #include <lib/spd/common/spd_decoder.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/find.H> using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_2.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_2.C index a76adbb91..9d4aa7cc9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_2.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/lrdimm/lrdimm_decoder_v1_2.C @@ -43,7 +43,7 @@ #include <lib/spd/lrdimm/lrdimm_decoder.H> #include <lib/spd/common/spd_decoder.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/find.H> using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_0.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_0.C index ad9257cae..4590a30c3 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_0.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_0.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -42,7 +42,7 @@ #include <lib/spd/rdimm/rdimm_decoder.H> #include <lib/spd/common/spd_decoder.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/find.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_1.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_1.C index d4e81228c..39f6529e3 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_1.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/rdimm/rdimm_decoder_v1_1.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -33,7 +33,7 @@ #include <lib/spd/rdimm/rdimm_decoder.H> #include <lib/spd/common/spd_decoder.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/find.H> using fapi2::TARGET_TYPE_MCBIST; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C index 10dd37fbe..b8ddcb2a2 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C @@ -47,7 +47,7 @@ #include <lib/spd/rdimm/rdimm_raw_cards.H> #include <lib/spd/lrdimm/lrdimm_raw_cards.H> #include <lib/utils/checker.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/conversions.H> #include <lib/utils/find.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C index 771df1c77..02ea7c1f9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/c_str.H> +#include <c_str.H> using fapi2::TARGET_TYPE_MCBIST; using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H deleted file mode 100644 index 23c7ce6ee..000000000 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H +++ /dev/null @@ -1,78 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ -/* [+] 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 c_str.H -/// @brief Function to return the C-string name of a thing -/// -// *HWP HWP Owner: Brian Silver <bsilver@us.ibm.com> -// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com> -// *HWP Team: Memory -// *HWP Level: 2 -// *HWP Consumed by: HB:FSP - -#ifndef _MSS_C_STR_H_ -#define _MSS_C_STR_H_ - -#include <fapi2.H> - -namespace mss -{ - -// Thread local storage for the string we're going to create. -//TODO RTC:153924 Remove the else case when issue is resolved -#ifndef PLAT_NO_THREAD_LOCAL_STORAGE - extern thread_local char c_str_storage[fapi2::MAX_ECMD_STRING_LEN]; -#else - extern char c_str_storage[fapi2::MAX_ECMD_STRING_LEN]; -#endif - -/// -/// @brief non-target c_str general declaration -/// @tparam T - type you want the const char * for -/// @param[in] i_input - input you want the const char * for -/// @return const char * -/// -template< typename T > -const char* c_str( const T& i_input ); - -/// -/// @brief fapi2::Target c_str general declaration -/// @tparam T - fapi2::TargetType you want the name for -/// @param[in] i_target - target you want the name for -/// @return const char * -/// -template< fapi2::TargetType T > -const char* c_str( const fapi2::template Target<T>& i_target ) -{ - fapi2::toString( i_target, c_str_storage, fapi2::MAX_ECMD_STRING_LEN ); - return c_str_storage; -} - -template<> -const char* c_str( const fapi2::template Target<fapi2::TARGET_TYPE_DIMM>& i_target ); - -} -#endif 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 index 35e145c54..293f1eeac 100644 --- 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 @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/utils/find.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H index bacf6f00d..d5b7a23d1 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,15 +37,13 @@ #define _MSS_FIND_H #include <fapi2.H> -#include <map> #include <vector> #include <lib/utils/pos.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { - /// /// @brief find a set of elements based on a fapi2 target /// @tparam M the target type to be returned diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H index 305ec3489..0a43ca394 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <lib/utils/find.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H index 7cd747dd6..69099eacb 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H @@ -37,7 +37,7 @@ #define _MSS_SCOM_H_ #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> // // Wrapping scom operations: We wrap fapi2::get/putScom for two reasons. The diff --git a/src/import/chips/p9/procedures/hwp/memory/mss.H b/src/import/chips/p9/procedures/hwp/memory/mss.H index d85840698..bc2499304 100644 --- a/src/import/chips/p9/procedures/hwp/memory/mss.H +++ b/src/import/chips/p9/procedures/hwp/memory/mss.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -46,7 +46,7 @@ #include <lib/shared/mss_kind.H> #include <lib/utils/index.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/num.H> #include <lib/utils/pos.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.mk index 7b271b9c4..a446cdd1c 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.mk +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -22,5 +22,10 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG + +# Include the macros and things for MSS procedures +-include 00common.mk + PROCEDURE=p9_mss_eff_config +$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.mk index 88dcead78..787313022 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.mk +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_eff_config_thermal.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -22,6 +22,11 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG + +# Include the macros and things for MSS procedures +-include 00common.mk + PROCEDURE=p9_mss_eff_config_thermal lib$(PROCEDURE)_DEPLIBS += p9_mss_bulk_pwr_throttles +$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) $(call BUILD_PROCEDURE) 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 646885e34..9ccb0e58f 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 @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -48,7 +48,7 @@ #include <lib/spd/common/spd_decoder.H> #include <lib/spd/spd_factory.H> #include <lib/freq/cas_latency.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/freq/cycle_time.H> #include <lib/utils/find.H> #include <lib/utils/count_dimm.H> diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.mk index a4f5b714f..aa89f1c6b 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.mk +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_memdiag.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -23,5 +23,9 @@ # # IBM_PROLOG_END_TAG +# Include the macros and things for MSS procedures +-include 00common.mk + PROCEDURE=p9_mss_memdiag +$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.mk index fd85d15a6..01852734e 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.mk +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -23,6 +23,10 @@ # # IBM_PROLOG_END_TAG +# Include the macros and things for MSS procedures +-include 00common.mk + PROCEDURE=p9_mss_scominit $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/initfiles) +$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.C index 720dfe00a..0af0b59fe 100644 --- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.C +++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.C @@ -47,7 +47,7 @@ #include <lib/spd/spd_factory.H> #include <lib/spd/common/spd_decoder.H> #include <lib/eff_config/attr_setters.H> -#include <lib/utils/c_str.H> +#include <c_str.H> #include <lib/utils/pos.H> #include <lib/utils/find.H> #include <lib/utils/checker.H> diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk index 8bbfe2866..12b547697 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -22,7 +22,9 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG + PROCEDURE=p9_mss_eff_grouping OBJS+=p9_fbc_utils.o $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/memory/) +$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/generic/memory) $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk index bee1ce1d9..b06a04075 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -22,7 +22,10 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG + +# Include the macros and things for MSS procedures +-include 00common.mk + PROCEDURE=p9_mss_setup_bars -$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/memory/) -$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/memory/lib) +$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_throttle_sync.mk b/src/import/chips/p9/procedures/hwp/nest/p9_throttle_sync.mk index 3f1f2c4d6..e6bbc24bb 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_throttle_sync.mk +++ b/src/import/chips/p9/procedures/hwp/nest/p9_throttle_sync.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -22,7 +22,8 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG + PROCEDURE=p9_throttle_sync $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/memory/) -$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/memory/lib) +$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/generic/memory) $(call BUILD_PROCEDURE) |
