From 25a46875b4bd8e7da5d5b2e342467ee2183e228b Mon Sep 17 00:00:00 2001 From: Jacob Harvey Date: Mon, 10 Jul 2017 16:42:09 -0500 Subject: L3 work for mss xmls mss_spd, mss_volt, mss_general, mss_data_buffer, mss_update_errors Change-Id: I1252d6d11900e88e0842c234c5ed815063e68ec0 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42962 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Louis Stermole Reviewed-by: Daniel M. Crowell Reviewed-by: ANDRE A. MARIN Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44229 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: JACOB L. HARVEY --- .../generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H | 10 ++++++++-- .../generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C | 4 ++-- .../generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C | 4 ++-- src/import/generic/memory/lib/spd/common/dimm_module_decoder.H | 4 ++-- src/import/generic/memory/lib/spd/common/rcw_settings.H | 4 ++-- .../generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4.H | 4 ++-- .../memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_0.C | 4 ++-- .../memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_1.C | 4 ++-- .../memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_2.C | 4 ++-- .../generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.C | 4 ++-- .../generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.H | 10 +++++++--- .../generic/memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4.H | 4 ++-- .../memory/lib/spd/rdimm/ddr4/rdimm_decoder_ddr4_v1_0.C | 4 ++-- src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.C | 4 ++-- src/import/generic/memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.H | 9 ++++++--- src/import/generic/memory/lib/utils/c_str.H | 2 +- src/import/generic/memory/lib/utils/find.H | 2 +- src/import/generic/memory/lib/utils/index.H | 2 +- src/import/generic/memory/lib/utils/pos.H | 2 +- src/import/generic/memory/lib/utils/scom.H | 4 ++-- 20 files changed, 51 insertions(+), 38 deletions(-) (limited to 'src/import/generic/memory/lib') diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H index 237e63378..7b4c1c300 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H @@ -28,9 +28,9 @@ /// @brief SPD decoder declarations /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_SPD_DECODER_H_ @@ -58,6 +58,9 @@ namespace mss namespace spd { +/// +/// @brief sdram package types. Follows encodings in SPD +/// enum sdram_package_type : uint8_t { // Package Type @@ -70,6 +73,9 @@ enum sdram_package_type : uint8_t SINGLE_LOAD_STACK = 2, ///< Single load stack (3DS) }; +/// +/// @brief enum for voltage information. Encoding comes from SPD +/// enum nominal_voltage : uint8_t { NOT_OPERABLE = 0, ///< Not operable at 1.2V diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C index 845648752..7e7bf4dc7 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C @@ -27,9 +27,9 @@ /// @brief SPD decoder definitions /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP // std lib diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C index 19b685261..bc48d326b 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C @@ -27,9 +27,9 @@ /// @brief SPD decoder definitions /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP // fapi2 diff --git a/src/import/generic/memory/lib/spd/common/dimm_module_decoder.H b/src/import/generic/memory/lib/spd/common/dimm_module_decoder.H index 318bd6b86..67f1b9a23 100644 --- a/src/import/generic/memory/lib/spd/common/dimm_module_decoder.H +++ b/src/import/generic/memory/lib/spd/common/dimm_module_decoder.H @@ -28,9 +28,9 @@ /// @brief base dimm module SPD decoder declarations /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP diff --git a/src/import/generic/memory/lib/spd/common/rcw_settings.H b/src/import/generic/memory/lib/spd/common/rcw_settings.H index e9fab00e7..e3a80c73f 100644 --- a/src/import/generic/memory/lib/spd/common/rcw_settings.H +++ b/src/import/generic/memory/lib/spd/common/rcw_settings.H @@ -28,9 +28,9 @@ /// @brief Raw card data structure /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_RAW_CARDS_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 ffa68d1fe..087c4b596 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 @@ -28,9 +28,9 @@ /// @brief LRDIMM module SPD decoder declarations /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP diff --git a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_0.C b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_0.C index 37c161ae5..1adf585bb 100644 --- a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_0.C +++ b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_0.C @@ -28,9 +28,9 @@ /// @brief LRDIMM module SPD decoder definitions for revision 1.0 /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP // std lib diff --git a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_1.C b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_1.C index 05786a6a1..5717da12d 100644 --- a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_1.C +++ b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_1.C @@ -28,9 +28,9 @@ /// @brief LRDIMM module SPD decoder definitions for revision 1.1 /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP // std lib diff --git a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_2.C b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_2.C index 191d770e1..d48b1444e 100644 --- a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_2.C +++ b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_decoder_ddr4_v1_2.C @@ -28,9 +28,9 @@ /// @brief LRDIMM module SPD decoder definitions for revision 1.2 /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP // std lib diff --git a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.C b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.C index ccc90e02e..99ea68a38 100644 --- a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.C +++ b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.C @@ -29,9 +29,9 @@ /// Contains RCW settings per raw card rev /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB // std lib diff --git a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.H b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.H index e3a99698d..9a11472f4 100644 --- a/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.H +++ b/src/import/generic/memory/lib/spd/lrdimm/ddr4/lrdimm_raw_cards.H @@ -28,9 +28,9 @@ /// @brief Raw card data structure /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_LRDIMM_RAW_CARDS_H_ @@ -46,10 +46,14 @@ namespace mss namespace lrdimm { -// In the order of the vector below which needs to be sorted by enum value +/// +/// @brief raw card revs for LRDIMMs +/// @note In the order of the vector below which needs to be sorted by enum value +/// enum raw_card_rev : uint8_t { // TODO RTC:160116 Fill in valid RCD data for LRDIMM + /// LRDIMM Raw Card encoding for B0 B0 = 0x01, }; 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 b17e410ff..61d47700d 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 @@ -28,9 +28,9 @@ /// @brief RDIMM module SPD decoder declarations /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_RDIMM_DECODER_DDR4_H_ 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 a1f235606..4d4635bc2 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 @@ -27,9 +27,9 @@ /// @brief RDIMM module specific SPD decoder definitions /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP // std lib 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 bfe95679c..f6911aa5d 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 @@ -29,9 +29,9 @@ /// Contains RCW settings per raw card rev /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB // std lib 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 02c30ba79..b130de1b9 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 @@ -28,9 +28,9 @@ /// @brief Raw card data structure /// // *HWP HWP Owner: Andre Marin -// *HWP HWP Backup: Brian Silver +// *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_RDIMM_RAW_CARDS_H_ @@ -46,7 +46,10 @@ namespace mss namespace rdimm { -// In the order of the vector below which needs to be sorted by enum value +/// +/// @brief raw card encoding as per SPD +/// @note In the order of the vector below which needs to be sorted by enum value +/// enum raw_card_rev : uint8_t { A1 = 0x20, diff --git a/src/import/generic/memory/lib/utils/c_str.H b/src/import/generic/memory/lib/utils/c_str.H index a67744a84..313ee5054 100644 --- a/src/import/generic/memory/lib/utils/c_str.H +++ b/src/import/generic/memory/lib/utils/c_str.H @@ -30,7 +30,7 @@ // *HWP HWP Owner: Andre Marin // *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_C_STR_H_ diff --git a/src/import/generic/memory/lib/utils/find.H b/src/import/generic/memory/lib/utils/find.H index 239afa10a..6593c6132 100644 --- a/src/import/generic/memory/lib/utils/find.H +++ b/src/import/generic/memory/lib/utils/find.H @@ -27,7 +27,7 @@ /// @file find.H /// @brief Templates for finding things /// -// *HWP HWP Owner: Brian Silver +// *HWP HWP Owner: Jacob Harvey // *HWP HWP Backup: Andre Marin // *HWP Team: Memory // *HWP Level: 3 diff --git a/src/import/generic/memory/lib/utils/index.H b/src/import/generic/memory/lib/utils/index.H index 6c213c5ec..5bec01fbd 100644 --- a/src/import/generic/memory/lib/utils/index.H +++ b/src/import/generic/memory/lib/utils/index.H @@ -30,7 +30,7 @@ // *HWP HWP Owner: Andre Marin // *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_INDEX_H_ diff --git a/src/import/generic/memory/lib/utils/pos.H b/src/import/generic/memory/lib/utils/pos.H index a308ba7c6..478b44448 100644 --- a/src/import/generic/memory/lib/utils/pos.H +++ b/src/import/generic/memory/lib/utils/pos.H @@ -30,7 +30,7 @@ // *HWP HWP Owner: Andre Marin // *HWP HWP Backup: Jacob Harvey // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_POS_H_ diff --git a/src/import/generic/memory/lib/utils/scom.H b/src/import/generic/memory/lib/utils/scom.H index 314623e3f..ece32dac4 100644 --- a/src/import/generic/memory/lib/utils/scom.H +++ b/src/import/generic/memory/lib/utils/scom.H @@ -27,10 +27,10 @@ /// @file scom.H /// @brief Tools related to scom operations /// -// *HWP HWP Owner: Brian Silver +// *HWP HWP Owner: Jacob Harvey // *HWP HWP Backup: Andre Marin // *HWP Team: Memory -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: HB:FSP #ifndef _MSS_SCOM_H_ -- cgit v1.2.3