diff options
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/accessors/ddimm_get_efd.C | 12 | ||||
| -rw-r--r-- | src/import/hwpf/fapi2/include/fapi2_vpd_access.H | 6 |
2 files changed, 9 insertions, 9 deletions
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; diff --git a/src/import/hwpf/fapi2/include/fapi2_vpd_access.H b/src/import/hwpf/fapi2/include/fapi2_vpd_access.H index cbe9467df..0e4ebc2ca 100644 --- a/src/import/hwpf/fapi2/include/fapi2_vpd_access.H +++ b/src/import/hwpf/fapi2/include/fapi2_vpd_access.H @@ -91,7 +91,7 @@ class VPDInfo<TARGET_TYPE_OCMB_CHIP> : iv_vpd_type(i_vpd_type), iv_size(VPD_INFO_INVALID_64), iv_omi_freq_mhz(VPD_INFO_INVALID_64), - iv_rank_count(VPD_INFO_INVALID_64), + iv_rank(VPD_INFO_INVALID_64), iv_is_config_ffdc_enabled(true), iv_efd_type(VPD_INFO_INVALID_8), iv_dmb_mfg_id(VPD_INFO_INVALID_16), @@ -110,8 +110,8 @@ class VPDInfo<TARGET_TYPE_OCMB_CHIP> // frequency of attached OMI bus uint64_t iv_omi_freq_mhz; - // number of master ranks - uint64_t iv_rank_count; + // rank for which settings are valid + uint64_t iv_rank; // set to false to avoid collecting a real ReturnCode bool iv_is_config_ffdc_enabled; |
