Adds new LRDIMM raw cards settings

Change-Id: I27fb9b296457eb8e893058b24718ba6fb4aac964
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69392
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
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: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69404
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: Christian R. Geddes <crgeddes@us.ibm.com>

2 files changed, 28 insertions, 14 deletions

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 182b3fa34..d66c03bdb 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
@@ -46,27 +46,35 @@
 namespace mss
 {
 
-///
-/// @brief raw card B0 settings
-///
-// TODO RTC:160116 Fill in valid RCD data for LRDIMM
-rcw_settings lrdimm_rc_b0( 0x00, // RC00
+// raw card settings
+// fill in valid RCD data for LRDIMM
+rcw_settings lrdimm_rc_a0( 0x00,  // RC00
                            0x00); // RC01
-
+rcw_settings lrdimm_rc_b0( 0x00,
+                           0x00);
+rcw_settings lrdimm_rc_b1( 0x00,
+                           0x00);
+rcw_settings lrdimm_rc_b2( 0x00,
+                           0x00);
+rcw_settings lrdimm_rc_d2( 0x00,
+                           0x00);
 rcw_settings lrdimm_rc_default( 0x00, // RC00
                                 0x00); // RC01
 
-
 namespace lrdimm
 {
 
-// TODO - RTC:160121 Catch all for adding raw card data for DIMMs
+// Catch all for adding raw card data for DIMMs
 const std::vector< std::pair< uint8_t , rcw_settings> > RAW_CARDS =
 {
     // I expect this to grow as Warren M. expects us to have
     // settings for every raw card that JEDEC puts out.  Openpower
     // can't break due to a missing raw card...
+    {raw_card_rev::A0, lrdimm_rc_a0},
     {raw_card_rev::B0, lrdimm_rc_b0},
+    {raw_card_rev::B1, lrdimm_rc_b1},
+    {raw_card_rev::B2, lrdimm_rc_b2},
+    {raw_card_rev::D2, lrdimm_rc_d2},
 };
 
 }// lrdimm
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 2b3e4285d..308156e2f 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
@@ -46,15 +46,17 @@ namespace mss
 namespace lrdimm
 {
 
-///
-/// @brief raw card revs for LRDIMMs
-/// @note In the order of the vector below which needs to be sorted by enum value
-///
+// raw card revs for LRDIMMs
+// 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
+    // Fill in valid RCD data for LRDIMM
+    // LRDIMM Raw Card encoding for A0,B0,B1,B2,D2
+    A0 = 0x00,
     B0 = 0x01,
+    B1 = 0x21,
+    B2 = 0x41,
+    D2 = 0x43,
 };
 
 // Raw cards can share the same raw card # between RDIMM and LRDIMMs so
@@ -65,7 +67,11 @@ extern const std::vector< std::pair< uint8_t, rcw_settings> > RAW_CARDS;
 }// lrdimm
 
 // Exposed so we can test them.
+extern rcw_settings lrdimm_rc_a0;
 extern rcw_settings lrdimm_rc_b0;
+extern rcw_settings lrdimm_rc_b1;
+extern rcw_settings lrdimm_rc_b2;
+extern rcw_settings lrdimm_rc_d2;
 extern rcw_settings lrdimm_rc_default;
 
 }// mss