diff options
| author | Jacob Harvey <jlharvey@us.ibm.com> | 2017-06-07 17:08:52 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-22 22:40:26 -0400 |
| commit | 5a959794c96741e9e4c826e03b41abfe84d9e512 (patch) | |
| tree | 3fc181d1141552971b81f2300cf16fd49036b4c0 /src/import/generic/memory/lib/spd | |
| parent | 3e3e4b44fdf84bc9d62d95a6f034a7e23df5a063 (diff) | |
| download | talos-hostboot-5a959794c96741e9e4c826e03b41abfe84d9e512.tar.gz talos-hostboot-5a959794c96741e9e4c826e03b41abfe84d9e512.zip | |
Fix CSID: 2 slave ranks, termination in RCBCX
Change-Id: Ie19985e858f5d90b7ca74319c080b156d758ec6a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41515
Reviewed-by: Louis Stermole <stermole@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: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41799
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/generic/memory/lib/spd')
3 files changed, 13 insertions, 22 deletions
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 57527dbe5..8f6675c41 100644 --- a/src/import/generic/memory/lib/spd/common/rcw_settings.H +++ b/src/import/generic/memory/lib/spd/common/rcw_settings.H @@ -66,7 +66,6 @@ struct rcw_settings uint64_t iv_rc8x; uint64_t iv_rc9x; uint64_t iv_rcax; - uint64_t iv_rcbx; /// /// @brief default ctor @@ -113,7 +112,6 @@ struct rcw_settings /// @param[in] i_rc8x setting for register control word (RC8X) /// @param[in] i_rc9x setting for register control word (RC9X) /// @param[in] i_rcax setting for register control word (RCAX) - /// @param[in] i_rcbx setting for register control word (RCBX) /// constexpr rcw_settings( const uint64_t i_rc00, const uint64_t i_rc01, @@ -130,8 +128,7 @@ struct rcw_settings const uint64_t i_rc6x, const uint64_t i_rc8x, const uint64_t i_rc9x, - const uint64_t i_rcax, - const uint64_t i_rcbx ) + const uint64_t i_rcax) : iv_rc00(i_rc00), iv_rc01(i_rc01), iv_rc02(i_rc02), @@ -147,8 +144,7 @@ struct rcw_settings iv_rc6x(i_rc6x), iv_rc8x(i_rc8x), iv_rc9x(i_rc9x), - iv_rcax(i_rcax), - iv_rcbx(i_rcbx) + iv_rcax(i_rcax) {} /// 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 f4b943b2c..a63138843 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 @@ -65,8 +65,7 @@ rcw_settings lrdimm_rc_b0( 0x00, // RC00 0x00, // RC6C 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAx - 0x07);// RCBX + 0x00); // RCAX namespace lrdimm { 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 0f757153d..383fb7e09 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 @@ -64,8 +64,7 @@ rcw_settings rdimm_rc_c1( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00); // RCAX /// /// @brief raw card C2 settings @@ -86,8 +85,7 @@ rcw_settings rdimm_rc_c2( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00); // RCAX /// /// @brief raw card A1 settings @@ -107,8 +105,7 @@ rcw_settings rdimm_rc_a1( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00); // RCAX /// /// @brief raw card B1 settings @@ -129,8 +126,8 @@ rcw_settings rdimm_rc_b1( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00);// RCAX + /// /// @brief raw card B2 settings @@ -150,8 +147,8 @@ rcw_settings rdimm_rc_b2( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00);// RCAX + //// /// @brief raw card for custom dimms @@ -171,8 +168,8 @@ rcw_settings rdimm_rc_custom ( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00);// RCAX + /// /// @brief raw card VBU settings @@ -192,8 +189,7 @@ rcw_settings rdimm_rc_vbu( 0x02, // RC00 0x00, // RC6X 0x00, // RC8X 0x00, // RC9X - 0x00, // RCAX - 0x07);// RCBX + 0x00); // RCAX namespace rdimm { |
