From daeac77bf15f92df9a6a86ec45a9f370e219a234 Mon Sep 17 00:00:00 2001 From: Andre Marin Date: Mon, 23 Sep 2019 13:33:05 -0400 Subject: Add RC A2, B3, and C3 for 16Gb RDIMMs Change-Id: I0fc7abc092ca3935519bc768f5ffbef8770dbf83 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84137 Tested-by: FSP CI Jenkins Dev-Ready: STEPHEN GLANCY Reviewed-by: Louis Stermole Reviewed-by: Michael D Pardeik Tested-by: Jenkins Server Reviewed-by: STEPHEN GLANCY Tested-by: Hostboot CI Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84149 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M Crowell --- .../memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.C | 24 +++++++++++++++++++++- .../memory/lib/spd/rdimm/ddr4/rdimm_raw_cards.H | 10 +++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) (limited to 'src/import/generic') 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 19a839e17..ac30f2cd0 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,2018 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -52,6 +52,12 @@ namespace mss rcw_settings rdimm_rc_a1( 0x02, // RC00 Enable weak drive 0x00); // RC01 Enables all clocks +/// +/// @brief raw card A2 settings +/// +rcw_settings rdimm_rc_a2( 0x02, // RC00 Enable weak drive + 0x00); // RC01 Enables all clocks + /// /// @brief raw card B1 settings /// @note need to verify, copy from b2, need to verify with b1 annex @@ -65,6 +71,12 @@ rcw_settings rdimm_rc_b1( 0x02, // RC00 rcw_settings rdimm_rc_b2( 0x02, // RC00 0x00 ); // RC01 +/// +/// @brief raw card B3 settings +/// +rcw_settings rdimm_rc_b3( 0x02, // RC00 + 0x00 ); // RC01 + /// /// @brief raw card C1 settings /// @@ -78,6 +90,13 @@ rcw_settings rdimm_rc_c1( 0x02, // RC00 rcw_settings rdimm_rc_c2( 0x02, // RC00 0x0C ); // RC01 +/// +/// @brief raw card C3 settings +/// @note same settings as C1 +/// +rcw_settings rdimm_rc_c3( 0x02, // RC00 + 0x0C ); // RC01 + /// /// @brief raw card for custom dimms /// @@ -117,8 +136,11 @@ const std::vector< std::pair< uint8_t , rcw_settings> > RAW_CARDS = {raw_card_rev::B1, rdimm_rc_b1}, {raw_card_rev::C1, rdimm_rc_c1}, {raw_card_rev::VBU, rdimm_rc_vbu}, + {raw_card_rev::A2, rdimm_rc_a2}, {raw_card_rev::B2, rdimm_rc_b2}, {raw_card_rev::C2, rdimm_rc_c2}, + {raw_card_rev::B3, rdimm_rc_b3}, + {raw_card_rev::C3, rdimm_rc_c3}, {raw_card_rev::CUSTOM, rdimm_rc_custom}, }; 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 fedcbe356..e624861a0 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,2018 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -59,16 +59,19 @@ enum raw_card_rev : uint8_t A1 = 0x20, B1 = 0x21, - // RDIMM power-on C1 = 0x22, // TK - Change VBU value to a no-op value or a value that will never be reached -JLH VBU = 0x23, + A2 = 0x40, B2 = 0x41, C2 = 0x42, + B3 = 0x61, + C3 = 0x62, + // Default settings used for DIMMs that do not use a JEDEC raw card reference CUSTOM = 0xFF, }; @@ -83,10 +86,13 @@ extern const std::vector< std::pair< uint8_t, rcw_settings> > RAW_CARDS; // Exposed so we can test them. // Alphabetized list below extern rcw_settings rdimm_rc_a1; +extern rcw_settings rdimm_rc_a2; extern rcw_settings rdimm_rc_b1; extern rcw_settings rdimm_rc_b2; +extern rcw_settings rdimm_rc_b3; extern rcw_settings rdimm_rc_c1; extern rcw_settings rdimm_rc_c2; +extern rcw_settings rdimm_rc_c3; extern rcw_settings rdimm_rc_custom; extern rcw_settings rdimm_rc_nvdimm; extern rcw_settings rdimm_rc_vbu; -- cgit v1.2.1