From 7d86b40c30c1777f7f9b6f9ff2717933acae070d Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Sat, 16 Feb 2019 10:43:51 -0600 Subject: Modify rank variable for OCMB VPD lookup Switching from 'number of ranks' to 'which rank'. Change-Id: I5f489dc507fbec1e0f835742cb1266d60884b1ca Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71995 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Reviewed-by: Roland Veloz Reviewed-by: Daniel M. Crowell Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: ANDRE A. MARIN Reviewed-by: Jennifer A. Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72295 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Christian R. Geddes --- src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/import/chips/p9') diff --git a/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C b/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C index 718073d5b..1ac156002 100644 --- a/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C +++ b/src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C @@ -599,17 +599,17 @@ extern "C" /// Get the EFD MR // Look up the bit mask for the given MR - l_rankMask = ddrMasterRankToBitMask( io_vpdInfo.iv_rank_count); + l_rankMask = ddrMasterRankToBitMask( io_vpdInfo.iv_rank); // If no value for MR, then mapping of MR was unsuccessful FAPI_ASSERT( l_rankMask, fapi2::TEST_ERROR_A().set_TARGET(i_ocmbFapi2Target), "ddr4_get_efd: Master rank %d not supported by Axone", - io_vpdInfo.iv_rank_count ); + io_vpdInfo.iv_rank ); FAPI_DBG ("ddr4_get_efd: Caller supplied master rank = %d, " "converted to master rank bit value mask = 0x%.2X", - io_vpdInfo.iv_rank_count, l_rankMask); + io_vpdInfo.iv_rank, l_rankMask); //// Fourthly, find the EFD that matches the given frequency //// and master rank @@ -626,7 +626,7 @@ extern "C" "%d (mapped to 0x%.4X) and caller supplied master rank = " "%d (mapped to 0x%.2X)", io_vpdInfo.iv_omi_freq_mhz, l_freqMask, - io_vpdInfo.iv_rank_count, l_rankMask); + io_vpdInfo.iv_rank, l_rankMask); // Iterate over the EFDs looking for a match ii = 0; @@ -730,7 +730,7 @@ extern "C" "for frequency %d (frequency bit mask 0x%.4X) and " "master rank %d (master rank bit mask 0x%.2X)", io_vpdInfo.iv_omi_freq_mhz, l_freqMask, - io_vpdInfo.iv_rank_count, l_rankMask); + io_vpdInfo.iv_rank, l_rankMask); // If unable to collect FFDC and assert, at least trace out error // and exit with false @@ -738,7 +738,7 @@ extern "C" "for frequency = %d (frequency bit mask = 0x%.4X) and " "master rank = %d (master rank bit mask = 0x%.2X)", io_vpdInfo.iv_omi_freq_mhz, l_freqMask, - io_vpdInfo.iv_rank_count, l_rankMask); + io_vpdInfo.iv_rank, l_rankMask); fapi2::current_err == fapi2::FAPI2_RC_FALSE; goto fapi_try_exit; -- cgit v1.2.1