From 3ffad4a090112aacc7d3d42cff86534946776ae8 Mon Sep 17 00:00:00 2001 From: Andre Marin Date: Wed, 21 Feb 2018 10:16:11 -0600 Subject: Remove mss::c_str dependency for SPD decoder for future reuse mss::c_str is attribute dependent on p9 nimbus attributes. In order to reuse this decoder going forward (Cumulus, Axone, etc) we need to remove this dependency by using fapi2::toString as an alternative for trace printouts. Updated SPD folder backup. Change-Id: I7b3f6e2fe2351519760c2fe54c66967052706671 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54550 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Louis Stermole Reviewed-by: STEPHEN GLANCY Dev-Ready: STEPHEN GLANCY Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54958 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- .../memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H') diff --git a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H index 087c4b596..f8031274e 100644 --- a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H +++ b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -28,7 +28,7 @@ /// @brief LRDIMM module SPD decoder declarations /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Jacob Harvey +// *HWP HWP Backup: Stephen Glancy // *HWP Team: Memory // *HWP Level: 3 // *HWP Consumed by: HB:FSP @@ -55,10 +55,6 @@ namespace lrdimm /// class decoder_v1_0 : public dimm_module_decoder { - protected: - - const fapi2::Target iv_target; - public: // First field - SPD byte @@ -104,12 +100,6 @@ class decoder_v1_0 : public dimm_module_decoder constexpr static field_t DATA_BUFFER_GAIN_ADJUST{156, 7, 1}; constexpr static field_t DATA_BUFFER_DFE{156, 6, 1}; - // Allows injection of errors for testing - // TK - Consider API change to use setter/getters - // for this instance variable, RDIMM decoder - // uses this interface so they have to match - AAM - std::vector iv_spd_data; - // deleted default ctor decoder_v1_0() = delete; @@ -120,7 +110,7 @@ class decoder_v1_0 : public dimm_module_decoder /// decoder_v1_0(const fapi2::Target& i_target, const std::vector& i_spd_data) - : iv_target(i_target), iv_spd_data(i_spd_data) + : dimm_module_decoder(i_target, i_spd_data) {} /// -- cgit v1.2.1