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 <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54958
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 37 insertions, 39 deletions

diff --git a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4.H b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4.H
index 61d47700d..0ec15c90e 100644
--- a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4.H
+++ b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_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 RDIMM module SPD decoder declarations
 ///
 // *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com>
+// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: HB:FSP
@@ -55,6 +55,7 @@ namespace rdimm
 class decoder_v1_0 : public dimm_module_decoder
 {
     protected:
+
         enum
         {
             // Byte 128
@@ -160,7 +161,8 @@ class decoder_v1_0 : public dimm_module_decoder
         /// @param[in] i_spd_data vector DIMM SPD data
         ///
         decoder_v1_0(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>& i_target,
-                     const std::vector<uint8_t>& i_spd_data): iv_target(i_target), iv_spd_data(i_spd_data)
+                     const std::vector<uint8_t>& i_spd_data):
+            dimm_module_decoder(i_target, i_spd_data)
         {}
 
         ///
@@ -355,10 +357,6 @@ class decoder_v1_0 : public dimm_module_decoder
         ///
         virtual fapi2::ReturnCode a_side_clk_output_driver(uint8_t& o_output) const override;
 
-    protected:
-        const fapi2::Target<fapi2::TARGET_TYPE_DIMM> iv_target;
-        const std::vector<uint8_t> iv_spd_data;
-
 };// decoder_v1_0
 
 ///
diff --git a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_0.C b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_0.C
index 4d4635bc2..021130412 100644
--- a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_0.C
+++ b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_0.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -27,7 +27,7 @@
 /// @brief RDIMM module specific SPD decoder definitions
 ///
 // *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com>
+// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: HB:FSP
@@ -91,7 +91,7 @@ fapi2::ReturnCode decoder_v1_0::max_module_nominal_height(uint8_t& o_output) con
     o_output = l_field_bits;
 
     FAPI_INF("%s. Max module nominal height: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -125,7 +125,7 @@ fapi2::ReturnCode decoder_v1_0::front_module_max_thickness(uint8_t& o_output) co
     o_output = l_field_bits;
 
     FAPI_INF("%s. Front module max thickness: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -160,7 +160,7 @@ fapi2::ReturnCode decoder_v1_0::back_module_max_thickness(uint8_t& o_output) con
     o_output = l_field_bits;
 
     FAPI_INF("%s. Back module max thickness: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -195,7 +195,7 @@ fapi2::ReturnCode decoder_v1_0::num_registers_used(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Number of registers used on RDIMM : %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -230,7 +230,7 @@ fapi2::ReturnCode decoder_v1_0::num_rows_of_drams(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Number of rows of DRAMs on RDIMM : %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -265,7 +265,7 @@ fapi2::ReturnCode decoder_v1_0::heat_spreader_thermal_char(uint8_t& o_output) co
     o_output = l_field_bits;
 
     FAPI_INF("%s. Heat spreader thermal characteristics: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -299,7 +299,7 @@ fapi2::ReturnCode decoder_v1_0::heat_spreader_solution(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Heat spreader solution: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -334,7 +334,7 @@ fapi2::ReturnCode decoder_v1_0::num_continuation_codes(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Number of continuation codes: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -358,14 +358,14 @@ fapi2::ReturnCode decoder_v1_0::reg_manufacturer_id_code(uint8_t& o_output) cons
 
     // Trace in the front assists w/ debug
     FAPI_INF("%s SPD data at Byte %d: 0x%llX.",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              BYTE_INDEX,
              l_raw_byte);
 
     o_output = l_raw_byte;
 
     FAPI_INF("%s. Manufacturer ID code: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
     return fapi2::FAPI2_RC_SUCCESS;
@@ -387,14 +387,14 @@ fapi2::ReturnCode decoder_v1_0::register_rev_num(uint8_t& o_output) const
 
     // Trace in the front assists w/ debug
     FAPI_INF("%s SPD data at Byte %d: 0x%llX.",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              BYTE_INDEX,
              l_raw_byte);
 
     o_output = l_raw_byte;
 
     FAPI_INF("%s. Register revision number: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
     return fapi2::FAPI2_RC_SUCCESS;
@@ -427,7 +427,7 @@ fapi2::ReturnCode decoder_v1_0::register_to_dram_addr_mapping(uint8_t& o_output)
     o_output = l_field_bits;
 
     FAPI_INF("%s. Address mapping from register to dram: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -461,7 +461,7 @@ fapi2::ReturnCode decoder_v1_0::cke_signal_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for CKE: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -495,7 +495,7 @@ fapi2::ReturnCode decoder_v1_0::odt_signal_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for ODT: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -529,7 +529,7 @@ fapi2::ReturnCode decoder_v1_0::ca_signal_output_driver(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for CA: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -563,7 +563,7 @@ fapi2::ReturnCode decoder_v1_0::cs_signal_output_driver(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for CS: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -597,7 +597,7 @@ fapi2::ReturnCode decoder_v1_0::b_side_clk_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for clock (Y0,Y2): %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -631,7 +631,7 @@ fapi2::ReturnCode decoder_v1_0::a_side_clk_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for clock (Y1,Y3): %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
diff --git a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_1.C b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_1.C
index a1549a6db..9a6aa5446 100644
--- a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_1.C
+++ b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_1.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -84,7 +84,7 @@ fapi2::ReturnCode decoder_v1_1::register_and_buffer_type(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Types: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -119,7 +119,7 @@ fapi2::ReturnCode decoder_v1_1::cke_signal_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for CKE: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -153,7 +153,7 @@ fapi2::ReturnCode decoder_v1_1::odt_signal_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for ODT: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -187,7 +187,7 @@ fapi2::ReturnCode decoder_v1_1::cs_signal_output_driver(uint8_t& o_output) const
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for CS: %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -221,7 +221,7 @@ fapi2::ReturnCode decoder_v1_1::b_side_clk_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for clock (Y0,Y2): %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
@@ -255,7 +255,7 @@ fapi2::ReturnCode decoder_v1_1::a_side_clk_output_driver(uint8_t& o_output) cons
     o_output = l_field_bits;
 
     FAPI_INF("%s. Register Output Driver for clock (Y1,Y3): %d",
-             mss::c_str(iv_target),
+             iv_target_str_storage,
              o_output);
 
 fapi_try_exit:
diff --git a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.C b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.C
index 0fa879212..19a839e17 100644
--- a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.C
+++ b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -29,7 +29,7 @@
 /// Contains RCW settings per raw card rev
 ///
 // *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com>
+// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: FSP:HB
diff --git a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.H b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.H
index da834abbd..fedcbe356 100644
--- a/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.H
+++ b/src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.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 Raw card data structure
 ///
 // *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com>
+// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: HB:FSP