Skip to content

Commit

Permalink
Revert "Use query_cache_access_state to verify EQ scomable in corequa…
Browse files Browse the repository at this point in the history
…d_init"

This reverts commit 88f0b7f45fc4989990cf7cd94de3e80d1ce34872.

Change-Id: Ic7b2fd3d1767748a4306b4ed6b08acbfadc8f894
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40885
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40886
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
crgeddes authored and dcrowell77 committed May 24, 2017
1 parent 718ee2a commit d1fdac8
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_corequad_init.C
Expand Up @@ -74,7 +74,6 @@
// Includes
// -----------------------------------------------------------------------------
#include <p9_pm_corequad_init.H>
#include <p9_query_cache_access_state.H>

// -----------------------------------------------------------------------------
// Constant definitions
Expand Down Expand Up @@ -340,16 +339,11 @@ fapi2::ReturnCode pm_corequad_reset(
FAPI_IMP("Entering pm_corequad_reset...");

fapi2::buffer<uint64_t> l_data64;
fapi2::ReturnCode l_rc;
uint8_t l_chpltNumber = 0;
uint64_t l_address = 0;
uint32_t l_errMask = 0;
uint32_t l_firMask = 0;
uint32_t l_pollCount = 20;
bool l_l2_is_scanable = false;
bool l_l3_is_scanable = false;
bool l_l2_is_scomable = false;
bool l_l3_is_scomable = false;

auto l_eqChiplets = i_target.getChildren<fapi2::TARGET_TYPE_EQ>
(fapi2::TARGET_STATE_FUNCTIONAL);
Expand Down Expand Up @@ -398,21 +392,6 @@ fapi2::ReturnCode pm_corequad_reset(
FAPI_TRY(fapi2::putScom(l_quad_chplt, l_address, l_data64),
"ERROR: Failed to clear QUAD PPM ERROR");

//Cannot always rely on HWAS state, during MPIPL attr are not
//accurate, must use query_cache_access state prior to scomming
//ex targets
FAPI_EXEC_HWP(l_rc, p9_query_cache_access_state, l_quad_chplt,
l_l2_is_scomable, l_l2_is_scanable,
l_l3_is_scomable, l_l3_is_scanable);
FAPI_TRY(l_rc, "ERROR: failed to query cache access state for EQ %d",
l_chpltNumber);

if(!l_l2_is_scomable)
{
//Skip all of the scoms for this EQ if its not scommable
continue;
}

auto l_exChiplets = l_quad_chplt.getChildren<fapi2::TARGET_TYPE_EX>
(fapi2::TARGET_STATE_FUNCTIONAL);

Expand Down

0 comments on commit d1fdac8

Please sign in to comment.