diff options
| author | Yue Du <daviddu@us.ibm.com> | 2017-06-28 11:56:14 -0500 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 18:14:32 -0500 |
| commit | f3a37e4b3f6772d389ced42e33de91b719c91599 (patch) | |
| tree | e1781a4f27864e1f98bc0e0d03e0bb5b5a7cb075 | |
| parent | 3a7c8cf3de805b182801c69f6ee6ff5b658c1b28 (diff) | |
| download | talos-hcode-f3a37e4b3f6772d389ced42e33de91b719c91599.tar.gz talos-hcode-f3a37e4b3f6772d389ced42e33de91b719c91599.zip | |
STOP: CME no state loss causes stop level map
Change-Id: I5c3feb9e0376cf2c3d7325284612c4eebd014fad
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42558
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com>
Reviewed-by: BRIAN D. VICTOR <brian.d.victor1@ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
| -rwxr-xr-x | import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_entry.c | 26 |
1 files changed, 23 insertions, 3 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 9a167d0e..748cc1d4 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 @@ -229,6 +229,9 @@ p9_cme_stop_entry() uint32_t core_mask = 0; uint32_t core_raw = 0; uint32_t core = 0; + uint32_t thread = 0; + uint32_t pscrs = 0; + uint32_t no_state_loss = 0; uint32_t pm_states = 0; uint32_t lclr_data = 0; data64_t scom_data = {0}; @@ -237,7 +240,6 @@ p9_cme_stop_entry() #if HW402407_NDD1_TLBIE_STOP_WORKAROUND - uint32_t thread = 0; uint16_t lpid_c0[4] = {0, 0, 0, 0}; uint16_t lpid_c1[4] = {0, 0, 0, 0}; @@ -339,6 +341,21 @@ p9_cme_stop_entry() if (core & core_mask) { core_index = core_mask & 1; + no_state_loss = 0; + + for (thread = 0; thread < MAX_THREADS_PER_CORE; thread++) + { + // address are 0x20 apart between threads and 0x80 apart between cores + pscrs = in32((CME_LCL_PSCRS00 + (core_index << 7) + (thread << 5))); + + // if either esl or ec bit is off with at least one thread + if ((~pscrs) & BITS32(2, 2)) + { + no_state_loss = 1; + break; + } + } + G_cme_stop_record.req_level[core_index] = (pm_states & BITS64SH((36 + (core_index << 2)), 4)) >> SHIFT64SH((39 + (core_index << 2))); @@ -369,8 +386,11 @@ p9_cme_stop_entry() G_cme_stop_record.req_level[core_index] = STOP_LEVEL_4; } - if ((pCmeImgHdr->g_cme_mode_flags & CME_STOP_4_TO_2_BIT_POS) && - (G_cme_stop_record.req_level[core_index] == STOP_LEVEL_4)) + // Convert everything to stop2 if no state loss + // stop1 doesnt use req_level variable so doesnt matter + if (no_state_loss || + ((pCmeImgHdr->g_cme_mode_flags & CME_STOP_4_TO_2_BIT_POS) && + (G_cme_stop_record.req_level[core_index] == STOP_LEVEL_4))) { G_cme_stop_record.req_level[core_index] = STOP_LEVEL_2; } |
