diff options
3 files changed, 12 insertions, 4 deletions
diff --git a/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h b/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h index 4f509c841..9cb9fbac5 100644 --- a/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h +++ b/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h @@ -104,10 +104,10 @@ #define OCB_OCCFLG 0xc0060450 #define OCB_OCCFLG_CLR 0xc0060458 #define OCB_OCCFLG_OR 0xc0060460 +#define OCB_OCCFLG2 0xC0060C50 +#define OCB_OCCFLG2_CLR 0xC0060C58 +#define OCB_OCCFLG2_OR 0xC0060C60 #define OCB_OCCHBR 0xc0060478 -#define OCB_OCCFLG2 0xc0060c50 -#define OCB_OCCFLG2_CLR 0xc0060c58 -#define OCB_OCCFLG2_OR 0xc0060c60 #define OCB_CCSR 0xc0060480 #define OCB_CCSR_CLR 0xc0060488 #define OCB_CCSR_OR 0xc0060490 diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_pm_hcd_flags.h b/src/import/chips/p9/procedures/hwp/lib/p9_pm_hcd_flags.h index 9f3584de0..e187882ca 100644 --- a/src/import/chips/p9/procedures/hwp/lib/p9_pm_hcd_flags.h +++ b/src/import/chips/p9/procedures/hwp/lib/p9_pm_hcd_flags.h @@ -68,6 +68,12 @@ enum PM_GPE_OCCFLG_DEFS REQUEST_OCC_SAFE_STATE = 31 }; +//Enum form of OCC FLAG2. +enum PM_GPE_OCCFLG2_DEFS +{ + STOP_RECOVERY_TRIGGER_ENABLE = 29 +}; + // //Enum form of OCC SCRATCH2. // @@ -82,6 +88,7 @@ enum PM_GPE_OCC_SCRATCH2_DEFS PGPE_DEBUG_TRAP_ENABLE = 10, L3_CONTAINED_MODE = 11, PGPE_SAFE_MODE_ERROR = 12, + PM_DEBUG_HALT_ENABLE = 15, PGPE_OP_TRACE_DISABLE = 24, PGPE_OP_TRACE_MEM_MODE = 25 }; @@ -104,6 +111,7 @@ enum PM_CME_FLAGS_DEFS CME_FLAGS_STOP_BLOCK_ENTRY_C0 = 10, CME_FLAGS_STOP_BLOCK_ENTRY_C1 = 11, CME_FLAGS_CORE_QUIESCE_ACTIVE = 12, + CME_FLAGS_PM_DEBUG_HALT_ENABLE = 13, CME_FLAGS_WAIT_ON_PSTATE_START = 14, CME_FLAGS_PSTATES_ENABLED = 24, CME_FLAGS_FREQ_UPDT_DISABLE = 25, diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C index e82e1034e..24f4d14b7 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C @@ -173,7 +173,7 @@ fapi2::ReturnCode pstate_gpe_init( do { FAPI_TRY(getScom(i_target, PU_OCB_OCI_OCCS2_SCOM, l_occ_scratch2)); - FAPI_TRY(getScom(i_target, PU_GPE3_PPE_XIDBGPRO, l_xsr_iar)); + FAPI_TRY(getScom(i_target, PU_GPE2_PPE_XIDBGPRO, l_xsr_iar)); FAPI_DBG("OCC Scratch2: 0x%016lx; XSR: 0x%016lx Timeout: %d", l_occ_scratch2, l_xsr_iar, l_timeout_counter); // fapi2::delay takes ns as the arg |
