diff options
| author | Rahul Batra <rbatra@us.ibm.com> | 2017-05-18 08:52:53 -0500 |
|---|---|---|
| committer | hostboot <hostboot@us.ibm.com> | 2018-08-22 17:54:57 -0500 |
| commit | 6b56b1459f58e779f53611577186bc8d49054283 (patch) | |
| tree | 413738e81edf7a9deeefb2cf90a6bec0725f8759 | |
| parent | d5c4e6d6eb3cf77f0f1a88fe3fd1b8e307c635ea (diff) | |
| download | talos-hcode-6b56b1459f58e779f53611577186bc8d49054283.tar.gz talos-hcode-6b56b1459f58e779f53611577186bc8d49054283.zip | |
PSTATE: CME refactoring and cleanup
Change-Id: I27de746edab70e9d74183c2e7ce166cd8bb69b2e
Original-Change-Id: I03cc2316da7b997c467ece0412a5212e38718318
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40823
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: BRIAN D. VICTOR <brian.d.victor1@ibm.com>
Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
| -rwxr-xr-x | import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_entry.c | 7 | ||||
| -rw-r--r-- | import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_entry.c b/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_entry.c index de7f10b6..d14dac75 100755 --- a/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_entry.c +++ b/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_entry.c @@ -49,6 +49,7 @@ #include "p9_hcode_image_defines.H" extern CmeStopRecord G_cme_stop_record; +extern CmeRecord G_cme_record; #if HW402407_NDD1_TLBIE_STOP_WORKAROUND @@ -259,11 +260,11 @@ p9_cme_stop_entry() // filter with partial good and running core mask // core cannot enter stop if core is already stopped - core = core & G_cme_stop_record.core_enabled & + core = core & G_cme_record.core_enabled & G_cme_stop_record.core_running; PK_TRACE_DBG("Check: Core Select[%d] Enabled[%d] Running[%d]", - core, G_cme_stop_record.core_enabled, + core, G_cme_record.core_enabled, G_cme_stop_record.core_running); if (!core) @@ -853,7 +854,7 @@ p9_cme_stop_entry() } core_catchup = (in32(CME_LCL_EISR) & BITS32(20, 2)) >> SHIFT32(21); - core_catchup = core_catchup & G_cme_stop_record.core_enabled & + core_catchup = core_catchup & G_cme_record.core_enabled & G_cme_stop_record.core_running; if (core_catchup) diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h index 1210bc5b..d7c014f0 100644 --- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h +++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h @@ -219,8 +219,7 @@ enum SGPE_STOP_EVENT_LEVELS enum SGPE_STOP_CME_FLAGS { - CME_TRACE_ENABLE = BIT32(4), - CME_CHTM_ENABLE = BIT32(4), + CME_QUAD_MGR_INDICATOR = BIT32(3), CME_EX1_INDICATOR = BIT32(26), CME_SIBLING_FUNCTIONAL = BIT32(27), CME_CORE0_ENTRY_FIRST = BIT32(28), |
