diff options
| author | Prasad Bg Ranganath <prasadbgr@in.ibm.com> | 2018-09-16 13:30:26 -0500 |
|---|---|---|
| committer | hostboot <hostboot@us.ibm.com> | 2018-09-28 10:59:51 -0500 |
| commit | 90d69ca63b67a6bf8c644fe1f8afdc1467c39ed5 (patch) | |
| tree | 5d5289d65f6cbd0fe5e72742932e5da2c69a9a43 | |
| parent | 10bf99ef8b6377ba80b99607cf5c10d472c205d4 (diff) | |
| download | talos-hcode-90d69ca63b67a6bf8c644fe1f8afdc1467c39ed5.tar.gz talos-hcode-90d69ca63b67a6bf8c644fe1f8afdc1467c39ed5.zip | |
STOP:Dont clear pmc_pcb_intr_type0_pending in OISR1/OIMR1 register
Key_Cronus_Test=PM_REGRESS
Change-Id: I71aac7f826b0daa594de5f4db7a45ccd693f964f
CQ:SW444760
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66511
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>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
3 files changed, 8 insertions, 7 deletions
diff --git a/import/chips/p9/common/pmlib/include/occhw_irq_config.h b/import/chips/p9/common/pmlib/include/occhw_irq_config.h index 66a1e5d3..a67c7f90 100644 --- a/import/chips/p9/common/pmlib/include/occhw_irq_config.h +++ b/import/chips/p9/common/pmlib/include/occhw_irq_config.h @@ -119,7 +119,7 @@ OCCHW_IRQ_PMC_PCB_INTR_TYPE4_PENDING OCCHW_IRQ_TARGET_ID_GPE2 \ OCCHW_IRQ_PMC_PCB_INTR_TYPE5_PENDING OCCHW_IRQ_TARGET_ID_GPE2 \ OCCHW_IRQ_PMC_PCB_INTR_TYPE6_PENDING OCCHW_IRQ_TARGET_ID_GPE3 \ - OCCHW_IRQ_PMC_PCB_INTR_TYPE7_PENDING OCCHW_IRQ_TARGET_ID_NONE \ + OCCHW_IRQ_PMC_PCB_INTR_TYPE7_PENDING OCCHW_IRQ_TARGET_ID_GPE3 \ OCCHW_IRQ_PMC_O2S_0A_ONGOING OCCHW_IRQ_TARGET_ID_NONE \ OCCHW_IRQ_PMC_O2S_0B_ONGOING OCCHW_IRQ_TARGET_ID_NONE \ OCCHW_IRQ_PMC_O2S_1A_ONGOING OCCHW_IRQ_TARGET_ID_NONE \ diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_init.c b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_init.c index bada474a..38409f43 100644 --- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_init.c +++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_init.c @@ -475,8 +475,8 @@ p9_sgpe_stop_init() // Hostboot Mode Booting CME //-------------------------------------------------------------------------- - PK_TRACE_INF("Setup: Clear Type 0,2,3,6 and ipi_lo_3 interrupts"); - out32(G_OCB_OISR1_CLR, (BIT32(13) | BITS32(15, 2) | BIT32(19) | BIT32(29))); + PK_TRACE_INF("Setup: Clear Type 0,2,3,5,6,7 and ipi_lo_3 interrupts"); + out32(G_OCB_OISR1_CLR, (BIT32(13) | BITS32(15, 2) | BITS32(18, 3) | BIT32(29))); out32(G_OCB_OPIT0PRA_CLR, BITS32(0, 24)); out32(G_OCB_OPIT1PRA_CLR, BITS32(0, 24)); out32(G_OCB_OPIT2PRA_CLR, BITS32(0, 24)); @@ -648,8 +648,8 @@ p9_sgpe_stop_init() out32(G_OCB_OISR0_CLR, (BIT32(8) | BIT32(16))); out32(G_OCB_OIMR0_CLR, (BIT32(8) | BIT32(16))); - PK_TRACE_INF("Setup: Unmask Type 0, 2,3,6 and ipi_lo_3 interrupts"); - out32(G_OCB_OIMR1_CLR, BIT32(13) | (BITS32(15, 2) | BIT32(19) | BIT32(29))); + PK_TRACE_INF("Setup: Unmask Type 2,3,5,6 and ipi_lo_3 interrupts, keep type0/7 masked as unused"); + out32(G_OCB_OIMR1_CLR, (BITS32(15, 2) | BITS32(18, 2) | BIT32(29))); //-------------------------------------------------------------------------- // SGPE Init Completed diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/pk_app_cfg.h b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/pk_app_cfg.h index 702a2c1e..c42d0957 100644 --- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/pk_app_cfg.h +++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/pk_app_cfg.h @@ -145,10 +145,11 @@ OCCHW_IRQ_CHECK_STOP_GPE3 OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED \ OCCHW_IRQ_IPI3_HI_PRIORITY OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED \ OCCHW_IRQ_IPI3_LO_PRIORITY OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED \ - OCCHW_IRQ_PMC_PCB_INTR_TYPE0_PENDING OCCHW_IRQ_TYPE_LEVEL OCCHW_IRQ_POLARITY_HI OCCHW_IRQ_MASKED \ + OCCHW_IRQ_PMC_PCB_INTR_TYPE0_PENDING OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED \ OCCHW_IRQ_PMC_PCB_INTR_TYPE2_PENDING OCCHW_IRQ_TYPE_LEVEL OCCHW_IRQ_POLARITY_HI OCCHW_IRQ_MASKED \ OCCHW_IRQ_PMC_PCB_INTR_TYPE3_PENDING OCCHW_IRQ_TYPE_LEVEL OCCHW_IRQ_POLARITY_HI OCCHW_IRQ_MASKED \ - OCCHW_IRQ_PMC_PCB_INTR_TYPE6_PENDING OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED + OCCHW_IRQ_PMC_PCB_INTR_TYPE6_PENDING OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED \ + OCCHW_IRQ_PMC_PCB_INTR_TYPE7_PENDING OCCHW_IRQ_TYPE_EDGE OCCHW_IRQ_POLARITY_RISING OCCHW_IRQ_MASKED // -------------------- |
