diff options
| author | Andre Marin <aamarin@us.ibm.com> | 2016-08-09 15:06:58 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-10-13 14:32:38 -0400 |
| commit | abe596145276ef0c0bd6496df3c787e76a12515a (patch) | |
| tree | 3fe2dfd3196297004cc9ce180cace89b63321f04 /src/import/chips/p9/procedures/hwp/accessors | |
| parent | 34194ec6550d9d97d5dd888e889f99691cc908a7 (diff) | |
| download | talos-hostboot-abe596145276ef0c0bd6496df3c787e76a12515a.tar.gz talos-hostboot-abe596145276ef0c0bd6496df3c787e76a12515a.zip | |
Add FW/Cronus VPD integration
Fixed FAPI_ASSERT bug in p9_get_mem_vpd_keyword.C
Updated VPD binary from Chris to support all freqs
Edited eff_config to match expected API vpd_info to be
filled in completely.
Edited ekb_ci_p9_full_cnfg to take VPD path
Change-Id: I755d3121dbb058470a7693aeb8f46bceb502858b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29298
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Steven B. Janssen <janssens@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29530
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/chips/p9/procedures/hwp/accessors')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C b/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C index af72417c1..a1ce17203 100644 --- a/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C +++ b/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C @@ -389,20 +389,21 @@ extern "C" "No match in mapping table"); //Was a valid keyword name found? - FAPI_ASSERT(MAPPING_LAYOUT_INVALID != l_second, - fapi2::GET_MEM_VPD_UNSUPPORTED_CONFIGURATION(). - set_MCS(fapi2::ATTR_MEMVPD_POS_Type(l_mcsPos)). - set_FREQ(uint32_t(i_vpd_info.iv_freq_mhz)). - set_DIMM0RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_0)). - set_DIMM1RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_1)). - set_VPDMCSMASK(uint16_t(((l_mapping[l_index].mcsMaskMSB) << 8) | - l_mapping[l_index].mcsMaskLSB)). - set_VPDFREQMASK(uint8_t(l_mapping[l_index].freqMask)). - set_VPDRANKMASK(uint8_t(((l_mapping[l_index].rankMaskMSB) << 8) | - l_mapping[l_index].rankMaskLSB)). - set_TARGET(i_target). - set_VPDTYPE(i_vpd_info.iv_vpd_type), - "Unsupported configuration"); + // Cast needed due to implicit int of enums + FAPI_ASSERT( static_cast<char>(MAPPING_LAYOUT_INVALID) != l_second, + fapi2::GET_MEM_VPD_UNSUPPORTED_CONFIGURATION(). + set_MCS(fapi2::ATTR_MEMVPD_POS_Type(l_mcsPos)). + set_FREQ(uint32_t(i_vpd_info.iv_freq_mhz)). + set_DIMM0RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_0)). + set_DIMM1RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_1)). + set_VPDMCSMASK(uint16_t(((l_mapping[l_index].mcsMaskMSB) << 8) | + l_mapping[l_index].mcsMaskLSB)). + set_VPDFREQMASK(uint8_t(l_mapping[l_index].freqMask)). + set_VPDRANKMASK(uint8_t(((l_mapping[l_index].rankMaskMSB) << 8) | + l_mapping[l_index].rankMaskLSB)). + set_TARGET(i_target). + set_VPDTYPE(i_vpd_info.iv_vpd_type), + "Unsupported configuration"); // build the keyword name o_keywordInfo.kwName[0] = l_first; |
