Skip to content

Commit

Permalink
Update get_ocmb_target() api to get_target()
Browse files Browse the repository at this point in the history 
Change-Id: I3d1f3b38d976389c05e90ce7b52081ed69a98332
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/93646
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: ANDRE A MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/93678
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R Geddes <crgeddes@us.ibm.com>
  • Loading branch information
@aamarin @crgeddes
aamarin authored and crgeddes committed Mar 25, 2020
1 parent c5c86d2 commit f92ebb1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions src/import/generic/memory/lib/data_engine/attr_engine_traits.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_MC_R

// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

FAPI_TRY(i_efd_data->phy_odt_impedance(l_odt_impedance));
// Map SPD value to desired setting
Expand Down Expand Up @@ -842,7 +842,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_MC_D

// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

FAPI_TRY(i_efd_data->phy_drive_impedance_pull_up(l_phy_drv_imp_pu));
// Map SPD value to desired setting
Expand Down Expand Up @@ -927,7 +927,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_MC_D

// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

FAPI_TRY(i_efd_data->phy_drive_impedance_pull_down(l_phy_drv_imp_pd));
// Map SPD value to desired setting
Expand Down Expand Up @@ -1053,7 +1053,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_MC_D

// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

FAPI_TRY(i_efd_data->atx_impedance(l_atx_impedance));
// Map SPD value to desired setting
Expand Down Expand Up @@ -1177,7 +1177,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_MC_D

// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

FAPI_TRY(i_efd_data->ck_impedance(l_ck_impedance));
// Map SPD value to desired setting
Expand Down Expand Up @@ -1301,7 +1301,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_MC_R

// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

FAPI_TRY(i_efd_data->alert_odt_impedance(l_alert_odt_imp));
// Map SPD value to desired setting
Expand Down Expand Up @@ -1372,7 +1372,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_DRAM
{0b0110, fapi2::ENUM_ATTR_MEM_SI_DRAM_RTT_NOM_OHM240},
// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

switch(i_efd_data->get_rank())
{
Expand Down Expand Up @@ -1469,7 +1469,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_DRAM
{0b0011, fapi2::ENUM_ATTR_MEM_SI_DRAM_RTT_WR_OHM240},
// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

switch(i_efd_data->get_rank())
{
Expand Down Expand Up @@ -1571,7 +1571,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_DRAM
{0b0111, fapi2::ENUM_ATTR_MEM_SI_DRAM_RTT_PARK_OHM240},
// All others reserved
};
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

switch(i_efd_data->get_rank())
{
Expand Down Expand Up @@ -1769,7 +1769,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_DRAM
{2, fapi2::ENUM_ATTR_MEM_SI_DRAM_DRV_IMP_DQ_DQS_OHM48},
};

const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

attr_integral_type l_dram_dic = 0;
FAPI_TRY(i_efd_data->dram_dic(l_dram_dic))
Expand Down Expand Up @@ -1831,7 +1831,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_ODT_
{
uint8_t l_value = 0;

const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

switch(i_efd_data->get_rank())
{
Expand Down Expand Up @@ -1922,7 +1922,7 @@ struct attrEngineTraits<P, attr_si_engine_fields, attr_si_engine_fields::SI_ODT_
{
uint8_t l_value = 0;

const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

switch(i_efd_data->get_rank())
{
Expand Down
4 changes: 2 additions & 2 deletions src/import/generic/memory/lib/data_engine/data_engine_utils.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ struct get<T, std::shared_ptr<efd::base_decoder>>
///
static fapi2::Target<fapi2::TARGET_TYPE_MEM_PORT> target(const std::shared_ptr<efd::base_decoder>& i_data)
{
return mss::find_targets<fapi2::TARGET_TYPE_MEM_PORT>(i_data->get_ocmb_target())[0];
return mss::find_targets<fapi2::TARGET_TYPE_MEM_PORT>(i_data->get_target())[0];
}
};

Expand All @@ -239,7 +239,7 @@ inline fapi2::ReturnCode update_data(const std::shared_ptr<efd::base_decoder>& i
const FFDC i_ffdc_code,
T (&o_data)[X][Y])
{
const auto l_ocmb = i_efd_data->get_ocmb_target();
const auto l_ocmb = i_efd_data->get_target();

// mss::index of rank number will % 4 (RANKS_PER_DIMM) to get us the corresponding dimm
const auto l_dimm_index = i_efd_data->get_rank() / mss::MAX_RANK_PER_DIMM;
Expand Down
4 changes: 2 additions & 2 deletions src/import/generic/memory/lib/spd/ddimm/efd_decoder.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -118,7 +118,7 @@ class base_decoder
/// @brief Gets decoder target
/// @return fapi2::Target<fapi2::TARGET_TYPE_DIMM>
///
virtual fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> get_ocmb_target() const
virtual fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> get_target() const
{
return iv_target;
}
Expand Down

0 comments on commit f92ebb1

Please sign in to comment.