Skip to content

Commit

Permalink
Fix RCW infrastructure for LRDIMM and RDIMMs
Browse files Browse the repository at this point in the history 
LRDIMMs and RDIMM can share the same reference raw card
identification from SPD and must be managed independent of
each other

Change-Id: I3f19665a823e7e133ac616aab706903ece40e8da
Original-Change-Id: I88ee324bd3774c99befbc08ac0fe02f9ecb2101d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32090
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37408
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@aamarin @dcrowell77
aamarin authored and dcrowell77 committed Mar 3, 2017
1 parent 5dc398c commit 7117715
Showing 1 changed file with 61 additions and 17 deletions.
78 changes: 61 additions & 17 deletions src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C
View file
Expand Up @@ -43,7 +43,9 @@
// mss lib
#include <lib/spd/spd_factory.H>
#include <lib/spd/common/spd_decoder.H>
#include <lib/spd/common/raw_cards.H>
#include <lib/spd/common/rcw_settings.H>
#include <lib/spd/rdimm/rdimm_raw_cards.H>
#include <lib/spd/lrdimm/lrdimm_raw_cards.H>
#include <lib/utils/checker.H>
#include <lib/utils/c_str.H>
#include <lib/utils/conversions.H>
Expand Down Expand Up @@ -380,7 +382,6 @@ static fapi2::ReturnCode dram_gen_setter(const fapi2::Target<TARGET_TYPE_DIMM>&

fapi_try_exit:
return fapi2::current_err;

}

///
Expand Down Expand Up @@ -448,7 +449,7 @@ fapi_try_exit:
static fapi2::ReturnCode rdimm_rev_helper(const fapi2::Target<TARGET_TYPE_DIMM>& i_target,
const uint8_t i_encoding_rev,
const uint8_t i_additions_rev,
const rcd01::raw_card_t i_raw_card,
const rcw_settings i_raw_card,
const std::vector<uint8_t>& i_spd_data,
std::shared_ptr<decoder>& o_fact_obj)
{
Expand Down Expand Up @@ -536,7 +537,7 @@ fapi_try_exit:
static fapi2::ReturnCode lrdimm_rev_helper(const fapi2::Target<TARGET_TYPE_DIMM>& i_target,
const uint8_t i_encoding_rev,
const uint8_t i_additions_rev,
const rcd01::raw_card_t i_raw_card,
const rcw_settings i_raw_card,
const std::vector<uint8_t>& i_spd_data,
std::shared_ptr<decoder>& o_fact_obj)
{
Expand Down Expand Up @@ -618,6 +619,59 @@ fapi_try_exit:
return fapi2::current_err;
}

///
/// @brief Retrieve current raw card settings
/// based on dimm type and raw card reference rev
/// @param[in] i_target dimm target
/// @param[in] i_spd_data SPD data
/// @param[out] o_raw_card raw card settings
/// @return FAPI2_RC_SUCCESS if okay
///
fapi2::ReturnCode raw_card_factory(const fapi2::Target<TARGET_TYPE_DIMM>& i_target,
const std::vector<uint8_t>& i_spd_data,
rcw_settings& o_raw_card)
{
uint8_t l_dimm_type = 0;
uint8_t l_ref_raw_card_rev = 0;

// Lets find out what raw card we are and grab the right
// raw card settings
FAPI_TRY( mss::eff_dimm_type(i_target, l_dimm_type) );
FAPI_TRY( reference_raw_card(i_target, i_spd_data, l_ref_raw_card_rev) );

FAPI_INF( "Retrieved dimm_type: %d, raw card reference: 0x%lx from SPD",
l_dimm_type, l_ref_raw_card_rev);

switch(l_dimm_type)
{
case fapi2::ENUM_ATTR_EFF_DIMM_TYPE_RDIMM:
if( !find_value_from_key( mss::rdimm::RAW_CARDS, l_ref_raw_card_rev, o_raw_card) )
{
FAPI_ERR( "Invalid reference raw card recieved for RDIMM: %d", l_ref_raw_card_rev );
return fapi2::FAPI2_RC_FALSE;
}

break;

case fapi2::ENUM_ATTR_EFF_DIMM_TYPE_LRDIMM:
if( !find_value_from_key( mss::lrdimm::RAW_CARDS, l_ref_raw_card_rev, o_raw_card) )
{
FAPI_ERR( "Invalid reference raw card recieved for LRDIMM: %d", l_ref_raw_card_rev );
return fapi2::FAPI2_RC_FALSE;
}

break;

default:
FAPI_ERR( "Recieved invalid dimm type: %d", l_dimm_type);
return fapi2::FAPI2_RC_FALSE;
break;
}

fapi_try_exit:
return fapi2::current_err;
}

///
/// @brief Object factory to select correct decoder
/// @param[in] i_target dimm target
Expand All @@ -640,33 +694,23 @@ fapi2::ReturnCode factory(const fapi2::Target<TARGET_TYPE_DIMM>& i_target,
uint8_t l_dimm_type = 0;
uint8_t l_encoding_rev = 0;
uint8_t l_additions_rev = 0;
uint8_t l_ref_raw_card_rev = 0;
rcd01::raw_card_t l_raw_card;
rcw_settings l_raw_card;

// Attribute setting needed by mss::c_str() which is used in
// the SPD decoder for debugging help
FAPI_TRY( dimm_type_setter(i_target, i_spd_data, l_dimm_type),
"%s. Failed to set DIMM type", mss::c_str(i_target) );
FAPI_TRY( dram_gen_setter(i_target, i_spd_data),
"%s. Failed to set DRAM generation", mss::c_str(i_target) );
FAPI_TRY( raw_card_factory(i_target, i_spd_data, l_raw_card),
"%s. Failed raw_card_factory()", mss::c_str(i_target) );

// Get revision levels to figure out what SPD version we are
FAPI_TRY( rev_encoding_level(i_target, i_spd_data, l_encoding_rev),
"%s. Failed to decode encoding level", mss::c_str(i_target) );
FAPI_TRY( rev_additions_level(i_target, i_spd_data, l_additions_rev),
"%s. Failed to decode additons level", mss::c_str(i_target) );

// Lets find out what raw card we are and grab the right
// raw card settings
FAPI_TRY( reference_raw_card(i_target, i_spd_data, l_ref_raw_card_rev),
"%s. Failed to decode reference raw card", mss::c_str(i_target) );

if( !find_value_from_key( rcd01::RAW_CARDS, l_ref_raw_card_rev, l_raw_card) )
{
FAPI_ERR( "%s. Invalid reference raw card recieved: %d", mss::c_str(i_target), l_ref_raw_card_rev );
return fapi2::FAPI2_RC_FALSE;
}

// Get decoder object needed for current dimm type and spd rev
switch(l_dimm_type)
{
Expand Down

0 comments on commit 7117715

Please sign in to comment.