diff options
| author | Yue Du <daviddu@us.ibm.com> | 2016-07-01 16:07:58 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-07-08 01:47:02 -0400 |
| commit | 503f8d91e055c19929a02ab00d139c3e53e13757 (patch) | |
| tree | ce8658c450da90480f9fd968ed6610e1197feea5 /import/chips | |
| parent | 9ef2dc6cac8b9a1508e098c720c01dd3125a17b7 (diff) | |
| download | talos-sbe-503f8d91e055c19929a02ab00d139c3e53e13757.tar.gz talos-sbe-503f8d91e055c19929a02ab00d139c3e53e13757.zip | |
CORE/CACHE: fix initf procedures on ring IDs and ex partial good
Change-Id: Ia6269a9753da86d63b268b48c8d2783ceb8e1aff
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26562
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph E. Dery <dery@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26565
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'import/chips')
5 files changed, 54 insertions, 39 deletions
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C index 932fd0f4..80e757db 100644 --- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C +++ b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C @@ -38,6 +38,7 @@ // Includes //------------------------------------------------------------------------------ +#include <p9_ringId.H> #include "p9_hcd_cache_dpll_initf.H" //------------------------------------------------------------------------------ @@ -57,7 +58,7 @@ p9_hcd_cache_dpll_initf( #ifndef P9_HCD_STOP_SKIP_SCAN FAPI_DBG("Scanning Cache DPLL FUNC Rings"); - FAPI_TRY(fapi2::putRing(i_target, EQ_DPLL_FUNC, + FAPI_TRY(fapi2::putRing(i_target, eq_dpll_func, fapi2::RING_MODE_HEADER_CHECK)); fapi_try_exit: diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C index 35d9c364..89fe9d78 100644 --- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C +++ b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C @@ -40,6 +40,7 @@ // Includes //------------------------------------------------------------------------------ +#include <p9_ringId.H> #include "p9_hcd_cache_gptr_time_initf.H" //------------------------------------------------------------------------------ @@ -58,44 +59,49 @@ p9_hcd_cache_gptr_time_initf( #ifndef P9_HCD_STOP_SKIP_SCAN + auto l_ex_targets = i_target.getChildren<fapi2::TARGET_TYPE_EX>(); + FAPI_DBG("Scanning Cache GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EQ_GPTR, + FAPI_TRY(fapi2::putRing(i_target, eq_gptr, fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L3 GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L3_GPTR, + FAPI_DBG("Scanning Cache TIME Rings"); + FAPI_TRY(fapi2::putRing(i_target, eq_time, fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L2 GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L2_GPTR, - fapi2::RING_MODE_HEADER_CHECK)); + for (auto l_ex : l_ex_targets) + { + FAPI_DBG("Scanning EX L3 GPTR Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l3_gptr, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L3 Refresh GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L3_REFR_GPTR, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L2 GPTR Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l2_gptr, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning Cache Analog GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EQ_ANA_GPTR, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L3 Refresh GPTR Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l3_refr_gptr, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning Cache DPLL GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EQ_DPLL_GPTR, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L3 TIME Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l3_time, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning Cache TIME Rings"); - FAPI_TRY(fapi2::putRing(i_target, EQ_TIME, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L2 TIME Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l2_time, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L3 TIME Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L3_TIME, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L3 Refresh TIME Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l3_refr_time, + fapi2::RING_MODE_HEADER_CHECK)); + } - FAPI_DBG("Scanning EX L2 TIME Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L2_TIME, + FAPI_DBG("Scanning Cache DPLL GPTR Rings"); + FAPI_TRY(fapi2::putRing(i_target, eq_dpll_gptr, fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L3 Reference TIME Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L3_REFR_TIME, + FAPI_DBG("Scanning Cache Analog GPTR Rings"); + FAPI_TRY(fapi2::putRing(i_target, eq_ana_gptr, fapi2::RING_MODE_HEADER_CHECK)); fapi_try_exit: diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C index 59b89ab6..5441d2a8 100644 --- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C +++ b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C @@ -38,6 +38,7 @@ // Includes //------------------------------------------------------------------------------ +#include <p9_ringId.H> #include "p9_hcd_cache_repair_initf.H" //------------------------------------------------------------------------------ @@ -56,21 +57,26 @@ p9_hcd_cache_repair_initf( #ifndef P9_HCD_STOP_SKIP_SCAN + auto l_ex_targets = i_target.getChildren<fapi2::TARGET_TYPE_EX>(); + FAPI_DBG("Scanning Cache REPAIR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EQ_REPR, + FAPI_TRY(fapi2::putRing(i_target, eq_repr, fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L3 REPAIR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L3_REPR, - fapi2::RING_MODE_HEADER_CHECK)); + for (auto l_ex : l_ex_targets) + { + FAPI_DBG("Scanning EX L3 REPAIR Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l3_repr, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L2 REPAIR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L2_REPR, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L2 REPAIR Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l2_repr, + fapi2::RING_MODE_HEADER_CHECK)); - FAPI_DBG("Scanning EX L3 Refresh REPAIR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EX_L3_REFR_REPR, - fapi2::RING_MODE_HEADER_CHECK)); + FAPI_DBG("Scanning EX L3 Refresh REPAIR Rings"); + FAPI_TRY(fapi2::putRing(l_ex, ex_l3_refr_repr, + fapi2::RING_MODE_HEADER_CHECK)); + } fapi_try_exit: diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C b/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C index 169cfa51..a932b8b0 100644 --- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C +++ b/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C @@ -40,6 +40,7 @@ // Includes //----------------------------------------------------------------------------- +#include <p9_ringId.H> #include "p9_hcd_core_gptr_time_initf.H" //----------------------------------------------------------------------------- @@ -59,11 +60,11 @@ p9_hcd_core_gptr_time_initf( #ifndef P9_HCD_STOP_SKIP_SCAN FAPI_DBG("Scanning Core GPTR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EC_GPTR, + FAPI_TRY(fapi2::putRing(i_target, ec_gptr, fapi2::RING_MODE_HEADER_CHECK)); FAPI_DBG("Scanning Core TIME Rings"); - FAPI_TRY(fapi2::putRing(i_target, EC_TIME, + FAPI_TRY(fapi2::putRing(i_target, ec_time, fapi2::RING_MODE_HEADER_CHECK)); fapi_try_exit: diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C b/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C index b711671a..75431f88 100644 --- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C +++ b/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C @@ -39,6 +39,7 @@ // Includes //----------------------------------------------------------------------------- +#include <p9_ringId.H> #include "p9_hcd_core_repair_initf.H" //----------------------------------------------------------------------------- @@ -58,7 +59,7 @@ p9_hcd_core_repair_initf( #ifndef P9_HCD_STOP_SKIP_SCAN FAPI_DBG("Scanning Core REPAIR Rings"); - FAPI_TRY(fapi2::putRing(i_target, EC_REPR, + FAPI_TRY(fapi2::putRing(i_target, ec_repr, fapi2::RING_MODE_HEADER_CHECK)); fapi_try_exit: |
