PM: Fixes for Livelock Scenarios

    -Fixes DPLL Ownership issues during Pstate Start
    -Fixes WOF Enablement and Quad/Core Active Update(STOP11/5) livelock
    scenario
    -Fixes PM Complex Suspend and Quad/Core Active Update(STOP11/5)
    livelock scenario
    -Fixes VDM Droop Suspend STOP entries livelock scenario

    Key_Cronus_Test=PM_REGRESS

Change-Id: I14a0dece4c74bc04618f7d1f3838dbe273bace94
CQ: SW425778
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57191
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+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>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: YUE DU <daviddu@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>

2 files changed, 10 insertions, 9 deletions

diff --git a/import/chips/p9/common/pmlib/include/pstate_pgpe_cme_api.h b/import/chips/p9/common/pmlib/include/pstate_pgpe_cme_api.h
index 570fb411..a171b47d 100644
--- a/import/chips/p9/common/pmlib/include/pstate_pgpe_cme_api.h
+++ b/import/chips/p9/common/pmlib/include/pstate_pgpe_cme_api.h
@@ -111,6 +111,8 @@ enum MESSAGE_ID_DB3
     MSGID_DB3_ENTER_SAFE_MODE           = 0x02,
     MSGID_DB3_REPLAY_DB0                = 0x03,
     MSGID_DB3_DISABLE_SGPE_HANDOFF      = 0x04,
+    MSGID_DB3_SUSPEND_STOP_ENTRY        = 0x05,
+    MSGID_DB3_UNSUSPEND_STOP_ENTRY      = 0x06,
     MSGID_DB3_IMMEDIATE_HALT            = 0xF1,
     MSGID_DB3_RESTORE_STATE_AND_HALT    = 0xF2,
 };
@@ -121,7 +123,9 @@ enum MESSAGEID_PCB_TYPE4_ACK_TYPES
     MSGID_PCB_TYPE4_ACK_PSTATE_PROTO_ACK         = 1,
     MSGID_PCB_TYPE4_ACK_PSTATE_SUSPENDED         = 2,
     MSGID_PCB_TYPE4_QUAD_MGR_AVAILABLE           = 3,
-    MSGID_PCB_TYPE4_NACK_DROOP_PRESENT           = 4
+    MSGID_PCB_TYPE4_NACK_DROOP_PRESENT           = 4,
+    MSGID_PCB_TYPE4_SUSPEND_ENTRY_ACK            = 5,
+    MSGID_PCB_TYPE4_UNSUSPEND_ENTRY_ACK          = 6
 };
 
 enum DB0_CLIP_BCAST_FIELDS
diff --git a/import/chips/p9/common/pmlib/include/wof_sgpe_pgpe_api.h b/import/chips/p9/common/pmlib/include/wof_sgpe_pgpe_api.h
index f018bd98..e8f843a6 100644
--- a/import/chips/p9/common/pmlib/include/wof_sgpe_pgpe_api.h
+++ b/import/chips/p9/common/pmlib/include/wof_sgpe_pgpe_api.h
@@ -48,14 +48,7 @@ enum MESSAGE_ID_IPI3HI_PGPE_SGPE
 
 enum CTRL_STOP_UPDATES_ACTIONS
 {
-    CTRL_STOP_UPDT_RESERVED0               = 0x0,
     CTRL_STOP_UPDT_ENABLE_CORE             = 0x1,
-    CTRL_STOP_UPDT_ENABLE_QUAD             = 0x2,
-    CTRL_STOP_UPDT_ENABLE_CORE_QUAD        = 0x3,
-    CTRL_STOP_UPDT_RESERVED1               = 0x4,
-    CTRL_STOP_UPDT_DISABLE_CORE            = 0x5,
-    CTRL_STOP_UPDT_DISABLE_QUAD            = 0x6,
-    CTRL_STOP_UPDT_DISABLE_CORE_QUAD       = 0x7
 };
 
 
@@ -65,6 +58,8 @@ enum UPDATE_ACTIVE_TYPES
     UPDATE_ACTIVE_CORES_TYPE_EXIT               = 0x1,
     UPDATE_ACTIVE_QUADS_TYPE_ENTRY              = 0x0,
     UPDATE_ACTIVE_QUADS_TYPE_EXIT               = 0x1,
+    UPDATE_ACTIVE_QUADS_EXIT_TYPE_DONE          = 0x0,
+    UPDATE_ACTIVE_QUADS_EXIT_TYPE_NOTIFY        = 0x1,
     UPDATE_ACTIVE_QUADS_ENTRY_TYPE_DONE         = 0x0,
     UPDATE_ACTIVE_QUADS_ENTRY_TYPE_NOTIFY       = 0x1
 };
@@ -85,6 +80,7 @@ enum SUSPEND_STOP_COMMANDS
 #define SGPE_PGPE_IPC_RC_SUCCESS                0x01
 #define SGPE_PGPE_RC_REQ_WHILE_PENDING_ACK      0x10
 #define SGPE_PGPE_RC_PM_COMPLEX_SUSPEND         0x11
+#define SGPE_PGPE_RC_WOF_DISABLED               0x12
 
 enum IPC_SGPE_PGPE_RETURN_CODES
 {
@@ -116,7 +112,8 @@ typedef union
         uint64_t msg_num                : 4;
         uint64_t update_type            : 1;
         uint64_t entry_type             : 1;
-        uint64_t reserved               : 2;
+        uint64_t exit_type              : 1;
+        uint64_t reserved               : 1;
         uint64_t return_code            : 8;
         uint64_t requested_quads        : 6;
         uint64_t reserved0              : 2;