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>

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)

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),