PGPE: Error Handling Support

Key_Cronus_Test=PM_REGRESS Change-Id: Ib750bb6021c0be02be5084853e77dbae9e10fec6 Original-Change-Id: I00aca629108aeaca88db34eec8e408f3cd48ff7f CQ: SW414842 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48635 Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com> Reviewed-by: YUE DU <daviddu@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
open-power · Aug 22, 2018 · dc1e756 · dc1e756
1 parent 1bd7fb1
commit dc1e756
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 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
@@ -1548,6 +1548,12 @@ p9_cme_stop_entry()
 
 #endif
 
+            if (G_cme_record.disableSGPEHandoff)
+            {
+                PK_TRACE_INF("SE.4+: Disable SGPE Handoff due to SGPE Halt");
+                break;
+            }
+
             //=============================
             MARK_TAG(SE_SGPE_HANDOFF, core)
             //=============================

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
@@ -398,9 +398,9 @@ void p9_sgpe_stop_suspend_all_cmes();
 void p9_sgpe_fit_handler();
 void p9_sgpe_pgpe_halt_handler(void*, PkIrqId);
 void p9_sgpe_checkstop_handler(void*, PkIrqId);
+void p9_sgpe_pig_type0_handler(void*, PkIrqId);
 void p9_sgpe_pig_type2_handler(void*, PkIrqId);
 void p9_sgpe_pig_type3_handler(void*, PkIrqId);
-void p9_sgpe_pig_type5_handler(void*, PkIrqId);
 void p9_sgpe_pig_type6_handler(void*, PkIrqId);
 void p9_sgpe_ipi3_low_handler(void*, PkIrqId);
 

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
@@ -53,7 +53,6 @@ p9_sgpe_stop_entry()
     uint64_t     local_xstop       = 0;
     data64_t     scom_data         = {0};
     data64_t     temp_data         = {0};
-    uint32_t     flg2_data         = 0;
 #if HW386311_NDD1_PBIE_RW_PTR_STOP11_FIX
     uint32_t      spin             = 0;
 #endif
@@ -70,9 +69,7 @@ p9_sgpe_stop_entry()
     MARK_TAG(BEGINSCOPE_STOP_ENTRY, 0)
     //================================
 
-    flg2_data = in32(OCB_OCCFLG2);
-
-    if( flg2_data & SGPE_HCODE_ERR_INJ_BIT )
+    if( in32(OCB_OCCFLG2) & BIT32(OCCFLG2_SGPE_HCODE_STOP_REQ_ERR_INJ))
     {
         PK_TRACE_ERR("SGPE STOP ENTRY ERROR INJECT TRAP");
         PK_PANIC(SGPE_STOP_ENTRY_TRAP_INJECT);