diff options
| author | Rahul Batra <rbatra@us.ibm.com> | 2017-12-11 17:16:21 -0600 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2018-02-01 16:29:16 -0600 |
| commit | 5706323b1d6b7ceffd424f7d3cd1bfd34de5dcfb (patch) | |
| tree | c1c967bd90a5cb43b612a14fe5072bb5839a5b56 | |
| parent | 562cb944afbee21d3fedbb42b7f0edcc37c4d861 (diff) | |
| download | talos-hcode-5706323b1d6b7ceffd424f7d3cd1bfd34de5dcfb.tar.gz talos-hcode-5706323b1d6b7ceffd424f7d3cd1bfd34de5dcfb.zip | |
PGPE: Fix FIT and actuation step conflict
Key_Cronus_Test=PM_REGRESS
Change-Id: I5dc836169a4a32be6389ecd9002469c41f8f0f49
Original-Change-Id: I8cf51a4e044c70871c5f74a5d3a6ecfe64dafd47
CQ: SW411044
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50779
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-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: YUE DU <daviddu@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
3 files changed, 10 insertions, 9 deletions
diff --git a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.h b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.h index 7c71af14..62d91648 100644 --- a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.h +++ b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.h @@ -47,7 +47,6 @@ void p9_pgpe_ipc_405_wof_vfrt(ipc_msg_t* cmd, void* arg); // void p9_pgpe_ipc_sgpe_updt_active_cores(ipc_msg_t* cmd, void* arg); void p9_pgpe_ipc_sgpe_updt_active_quads(ipc_msg_t* cmd, void* arg); -void p9_pgpe_ipc_ack_sgpe_ctrl_stop_updt_core_enable(ipc_msg_t* msg, void* arg); -void p9_pgpe_ipc_ack_sgpe_ctrl_stop_updt_core_disable(ipc_msg_t* msg, void* arg); +void p9_pgpe_ipc_ack_sgpe_ctrl_stop_updt(ipc_msg_t* msg, void* arg); #endif //_P9_PGPE_IPC_H_ diff --git a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_optrace.h b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_optrace.h index e38ad16a..5b4af67d 100644 --- a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_optrace.h +++ b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_optrace.h @@ -68,7 +68,7 @@ enum PGPE_OP_TRACE_ENCODES PRC_CORES_ACTV = 0x5A, PRC_QUAD_ACTV = 0x5B, FIT_TB_SYNC = 0x5C, - SGPE_SUSP_DONE = 0x4D, + SYSTEM_XSTOP = 0x4D, PRC_PM_SUSP = 0x4E, PRC_SAFE_MODE = 0x5F }; diff --git a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_pstate.h b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_pstate.h index fad148d7..becf1444 100644 --- a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_pstate.h +++ b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_pstate.h @@ -42,9 +42,8 @@ enum IPC_PEND_TBL IPC_PEND_WOF_CTRL = 4, IPC_PEND_WOF_VFRT = 5, IPC_PEND_SET_PMCR_REQ = 6, - IPC_ACK_CTRL_STOP_CORE_ENABLE = 7, - IPC_ACK_CTRL_STOP_CORE_DISABLE = 8, - MAX_IPC_PEND_TBL_ENTRIES = 9 + IPC_ACK_CTRL_STOP_UPDT = 7, + MAX_IPC_PEND_TBL_ENTRIES = 8 }; enum QUAD_BIT_MASK @@ -61,10 +60,12 @@ enum PSTATE_STATUS { PSTATE_INIT = 0, //PGPE Booted PSTATE_ACTIVE = 1, //Pstates are active - PSTATE_SAFE_MODE = 4, //Safe Mode + PSTATE_STOP_PENDING = 2, //Pstate Stop Pending + PSTATE_SAFE_MODE_PENDING = 3, //Safe Mode Pending + PSTATE_SAFE_MODE = 4, //Safe Mode PSTATE_STOPPED = 5, //Pstates are stopped PSTATE_PM_SUSPEND_PENDING = 6, //PM Complex Suspend Pending - PSTATE_PM_SUSPENDED = 7 //PM Complex Suspend + PSTATE_PM_SUSPENDED = 7 //PM Complex Suspend }; enum WOF_STATUS @@ -138,6 +139,7 @@ typedef struct uint16_t vindex, findex; uint32_t pendingPminClipBcast, pendingPmaxClipBcast; uint32_t semProcessPosted, semProcessSrc; + uint32_t actuating; } PgpePstateRecord __attribute__ ((aligned (8))); @@ -161,7 +163,7 @@ void p9_pgpe_pstate_clip_bcast(uint32_t clip_type); void p9_pgpe_pstate_process_quad_entry_notify(uint32_t quadsAffected); void p9_pgpe_pstate_process_quad_entry_done(uint32_t quadsAffected); void p9_pgpe_pstate_process_quad_exit(uint32_t quadsAffected); -void p9_pgpe_pstate_wof_ctrl(uint32_t action, uint32_t activeCores, uint32_t activeQuads); +void p9_pgpe_pstate_wof_ctrl(uint32_t action); void p9_pgpe_pstate_send_ctrl_stop_updt(uint32_t ctrl); void p9_pgpe_pstate_apply_safe_clips(); void p9_pgpe_pstate_safe_mode(); |
