diff options
author | Greg Still <stillgs@us.ibm.com> | 2017-09-18 10:35:25 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-09-23 10:51:34 -0400 |
commit | a4e480007e539ab8fd18bfb082f9757ae48bada4 (patch) | |
tree | 8ca4ef81448f3d4883e4c5cca50530879d8d8a3f /src/import/chips/p9 | |
parent | 172e4c440f89ea40784991a7b0e99e09d9f50be8 (diff) | |
download | talos-hostboot-a4e480007e539ab8fd18bfb082f9757ae48bada4.tar.gz talos-hostboot-a4e480007e539ab8fd18bfb082f9757ae48bada4.zip |
PM: remove WOF_TABLE_ACCESS_FAIL from p9_pstate_parameter_block
- write returned error from WOF_TABLES attribute access to error log directly
Change-Id: I8224e43babb528897fc87d3b1904271892e1ffe8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46340
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46391
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/pm/p9_pstate_parameter_block.C | 18 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/xml/error_info/p9_pstate_parameter_block_errors.xml | 12 |
2 files changed, 9 insertions, 21 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pstate_parameter_block.C b/src/import/chips/p9/procedures/hwp/pm/p9_pstate_parameter_block.C index a40bfecb2..d774fe986 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pstate_parameter_block.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pstate_parameter_block.C @@ -892,12 +892,12 @@ p9_pstate_wof_initialization (const GlobalPstateParmBlock* i_gppb, (*l_wof_table_data)); if (l_rc) { + + FAPI_INF("Pstate Parameter Block ATTR_WOF_TABLE_DATA attribute failed. Disabling WOF"); o_state->iv_wof_enabled = false; - FAPI_ASSERT_NOEXIT(false, - fapi2::PSTATE_PB_WOF_TABLE_ACCESS_FAIL(fapi2::FAPI2_ERRL_SEV_RECOVERED) - .set_CHIP_TARGET(FAPI_SYSTEM) - .set_FAPI_RC(l_rc), - "Pstate Parameter Block ATTR_WOF_TABLE_DATA attribute failed"); + + // Write the returned error content to the error log + fapi2::logError(l_rc,fapi2::FAPI2_ERRL_SEV_RECOVERED); break; } } @@ -3287,7 +3287,7 @@ proc_get_mvpd_poundw(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target is_vdm_enabled(o_state), is_wof_enabled(o_state)); // Exit if both VDM and WOF is disabled - if ((!is_vdm_enabled(o_state) && !is_wof_enabled(o_state)) && + if ((!is_vdm_enabled(o_state) && !is_wof_enabled(o_state)) && !i_skip_check) { FAPI_INF(" proc_get_mvpd_poundw: BOTH VDM and WOF are disabled. Skipping remaining checks"); @@ -4293,13 +4293,13 @@ uint32_t large_jump_interpolate (const Pstate i_pstate,const uint32_t i_attr_mvp operating_points[POWERSAVE].pstate, operating_points[NOMINAL].pstate); - uint32_t l_vdm_jump_value = (uint32_t)((int32_t)l_jump_value_set_ps + (((int32_t)l_slope_value * + uint32_t l_vdm_jump_value = (uint32_t)((int32_t)l_jump_value_set_ps + (((int32_t)l_slope_value * (i_ps_pstate - i_pstate)) >> THRESH_SLOPE_FP_SHIFT)); return l_vdm_jump_value; } //pstate2voltage -uint32_t pstate2voltage(const Pstate i_pstate, +uint32_t pstate2voltage(const Pstate i_pstate, const uint32_t i_attr_mvpd_data[PV_D][PV_W], const uint32_t i_step_frequency) { @@ -4319,7 +4319,7 @@ uint32_t pstate2voltage(const Pstate i_pstate, FAPI_INF ("l_SlopeValue %x",l_SlopeValue); - uint32_t l_vdd = (( (l_SlopeValue * (-i_pstate + operating_points[POWERSAVE].pstate)) >> + uint32_t l_vdd = (( (l_SlopeValue * (-i_pstate + operating_points[POWERSAVE].pstate)) >> VID_SLOPE_FP_SHIFT_12) + revle32(operating_points[POWERSAVE].vdd_mv)); FAPI_INF ("l_vdd %x",l_vdd); diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pstate_parameter_block_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pstate_parameter_block_errors.xml index eb177158b..94e1a2897 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_pstate_parameter_block_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_pstate_parameter_block_errors.xml @@ -236,18 +236,6 @@ </hwpError> <!-- ******************************************************************** --> <hwpError> - <rc>RC_PSTATE_PB_WOF_TABLE_ACCESS_FAIL</rc> - <description>Pstate Parameter Block ATTR_WOF_TABLE_DATA attribute access failed - </description> - <ffdc>CHIP_TARGET</ffdc> - <ffdc>FAPI_RC</ffdc> - <callout> - <procedure>CODE</procedure> - <priority>HIGH</priority> - </callout> - </hwpError> - <!-- ******************************************************************** --> - <hwpError> <rc>RC_PSTATE_PB_IQ_VPD_ERROR</rc> <description>#IQ data payload header is invalid</description> <ffdc>CHIP_TARGET</ffdc> |