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:16:41 -0600 |
| commit | 5abc620c6dbc7e736af592e70615586ea6c06a8c (patch) | |
| tree | d2376d30cd950250c0e0b2d492f060514501bb60 | |
| parent | 68ec3cd2d02cfc2ca12b8e8d0665447e7cafb607 (diff) | |
| download | talos-hcode-5abc620c6dbc7e736af592e70615586ea6c06a8c.tar.gz talos-hcode-5abc620c6dbc7e736af592e70615586ea6c06a8c.zip | |
PGPE: Fix FIT and actuation step conflict
Key_Cronus_Test=PM_REGRESS
Change-Id: I5e6fd78adb40480d43e273018548cccd7d006f02
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>
| -rw-r--r-- | import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.c | 14 | ||||
| -rw-r--r-- | import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_irq_handlers.c | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.c b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.c index 43bef826..9059fe5f 100644 --- a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.c +++ b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_ipc_handlers.c @@ -290,16 +290,10 @@ 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* cmd, void* arg) +void p9_pgpe_ipc_ack_sgpe_ctrl_stop_updt(ipc_msg_t* cmd, void* arg) { - PK_TRACE_INF("IPC: Core Updt Enable ACKed"); - G_pgpe_pstate_record.ipcPendTbl[IPC_ACK_CTRL_STOP_CORE_ENABLE].cmd = cmd; - G_pgpe_pstate_record.ipcPendTbl[IPC_ACK_CTRL_STOP_CORE_ENABLE].pending_processing = 1; -} + PK_TRACE_INF("IPC: Core Updt ACKed"); -void p9_pgpe_ipc_ack_sgpe_ctrl_stop_updt_core_disable(ipc_msg_t* cmd, void* arg) -{ - PK_TRACE_INF("IPC: Core Updt Disable ACKed"); - G_pgpe_pstate_record.ipcPendTbl[IPC_ACK_CTRL_STOP_CORE_DISABLE].cmd = cmd; - G_pgpe_pstate_record.ipcPendTbl[IPC_ACK_CTRL_STOP_CORE_DISABLE].pending_processing = 1; + G_pgpe_pstate_record.ipcPendTbl[IPC_ACK_CTRL_STOP_UPDT].cmd = cmd; + G_pgpe_pstate_record.ipcPendTbl[IPC_ACK_CTRL_STOP_UPDT].pending_processing = 1; } diff --git a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_irq_handlers.c b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_irq_handlers.c index 8346c9e0..f699772e 100644 --- a/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_irq_handlers.c +++ b/import/chips/p9/procedures/ppe_closed/pgpe/pstate_gpe/p9_pgpe_irq_handlers.c @@ -83,7 +83,11 @@ void p9_pgpe_irq_handler_occ_error(void* arg, PkIrqId irq) if (fir.fields.occ_hb_error == 1) { GPE_PUTSCOM(OCB_OCCLFIR_AND, ~BIT64(OCC_HB_ERROR_FIR)); - p9_pgpe_pstate_safe_mode(); + + if((G_pgpe_pstate_record.pstatesStatus == PSTATE_ACTIVE)) + { + G_pgpe_pstate_record.pstatesStatus = PSTATE_SAFE_MODE_PENDING; + } } else { |
