STOP: Disable Stop8

Change-Id: Ic724b4909798f7fccb1745ad5798ad985bb2ffb5
Original-Change-Id: I9fb54b8a96797fd1f78845db8fbbcb8c1a99eb1e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41948
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>

2 files changed, 26 insertions, 0 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 82c4d95b..39938738 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
@@ -372,7 +372,15 @@ p9_cme_stop_entry()
                         G_cme_stop_record.req_level[core_index] = STOP_LEVEL_8;
                     }
 
+#if DISABLE_STOP8
+
+                    if (1 &&
+
+#else
+
                     if ((pCmeImgHdr->g_cme_mode_flags & CME_STOP_8_TO_5_BIT_POS) &&
+
+#endif
                         (G_cme_stop_record.req_level[core_index] >= STOP_LEVEL_8 &&
                          G_cme_stop_record.req_level[core_index] <  STOP_LEVEL_11))
                     {
diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c
index 412295e2..9970843a 100644
--- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c
+++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c
@@ -104,6 +104,8 @@ p9_sgpe_stop_entry()
             G_sgpe_stop_record.state[qloop].req_state_x0 :
             G_sgpe_stop_record.state[qloop].req_state_x1 ;
 
+#if !DISABLE_STOP8
+
         // Check if EX and/or Quad qualifies to proceed with entry
         if (G_sgpe_stop_record.state[qloop].act_state_x0 <  LEVEL_EX_BASE &&
             G_sgpe_stop_record.state[qloop].req_state_x0 >= LEVEL_EX_BASE)
@@ -117,10 +119,20 @@ p9_sgpe_stop_entry()
             G_sgpe_stop_record.group.ex_r[VECTOR_ENTRY] |= BIT32(qloop);
         }
 
+#endif
+
         if (G_sgpe_stop_record.state[qloop].act_state_q <  LEVEL_EQ_BASE &&
             G_sgpe_stop_record.state[qloop].req_state_q >= LEVEL_EQ_BASE)
         {
             G_sgpe_stop_record.group.quad[VECTOR_ENTRY] |= BIT32(qloop);
+
+#if DISABLE_STOP8
+
+            G_sgpe_stop_record.group.ex_l[VECTOR_ENTRY] |= BIT32(qloop);
+            G_sgpe_stop_record.group.ex_r[VECTOR_ENTRY] |= BIT32(qloop);
+
+#endif
+
         }
 
         if (G_sgpe_stop_record.group.ex_l[VECTOR_ENTRY] ||
@@ -572,8 +584,14 @@ p9_sgpe_stop_entry()
             scom_data.words.lower = 0;
             scom_data.words.upper = (SSH_ACT_LV8_COMPLETE |
                                      (((uint32_t)entry_ongoing[cloop >> 1]) << SHIFT32(3)));
+
+#if !DISABLE_STOP8
+
             GPE_PUTSCOM_VAR(PPM_SSHSRC, CORE_ADDR_BASE, ((qloop << 2) + cloop), 0,
                             scom_data.value);
+
+#endif
+
         }
 
         PK_TRACE("Update QSSR: l2_stopped, drop stop_entry_ongoing");