From 3c46b699bec294a8023f5709958df62fb7d586df Mon Sep 17 00:00:00 2001 From: Dean Sanner Date: Fri, 15 Sep 2017 14:52:25 -0500 Subject: Allow request fused mode bit when in HW fused mode -Relax a restrictive check where the "force" fuse lab mode bit would cause a FW error even if the part is in HW fused mode (was just requesting same setting) -Check still prevents mistaken requests when in Normal core mode when lab mode can't override Change-Id: Iad710bceb90bd1bd8d988ba0234c446c63773158 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46292 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: PPE CI Reviewed-by: Joachim Fenkes Reviewed-by: Joseph J. McGill Reviewed-by: Gregory S. Still Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46409 Reviewed-by: Sachin Gupta --- src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C index 583a34fc..183e036a 100644 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C +++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C @@ -222,7 +222,8 @@ fapi2::ReturnCode p9_sbe_select_ex( } // Check that we're not trying to force fused cores on a chip where the - // force mechanism is disabled via eFuses */ + // force mechanism is disabled via eFuses AND we are not already in + // fused mode { fapi2::buffer l_perv_ctrl0; fapi2::buffer l_device_id_reg; @@ -231,7 +232,8 @@ fapi2::ReturnCode p9_sbe_select_ex( FAPI_TRY(fapi2::getScom(i_target, PERV_DEVICE_ID_REG, l_device_id_reg)); FAPI_ASSERT(!(l_perv_ctrl0.getBit() - && l_device_id_reg.getBit()), + && l_device_id_reg.getBit() && + !l_device_id_reg.getBit()), fapi2::SBE_SELECT_EX_FORCE_FUSED_CORES_DISABLED(), "Failed to force fused core mode because external control has been disabled via eFuses"); } -- cgit v1.2.1