diff options
author | Douglas Gilbert <dgilbert@us.ibm.com> | 2018-04-30 09:36:52 -0500 |
---|---|---|
committer | Martha Broyles <mbroyles@us.ibm.com> | 2018-05-03 14:06:39 -0400 |
commit | ba4bad1ee5d645698c541067de1d69fa2fd4ca11 (patch) | |
tree | 83a366cbd4c39e1a739b8eea0ad7ebf0d9947b4d /src/occ_gpe0 | |
parent | 8aa6ad0942ef15727db6ee5cbfee27972c1a2471 (diff) | |
download | talos-occ-ba4bad1ee5d645698c541067de1d69fa2fd4ca11.tar.gz talos-occ-ba4bad1ee5d645698c541067de1d69fa2fd4ca11.zip |
Fix reading EMPATH data from fused odd numbered cores
Change-Id: I1014ed6adf3fc7b22356f907532aa6f88259462c
CQ: FW678428
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58054
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Diffstat (limited to 'src/occ_gpe0')
-rw-r--r-- | src/occ_gpe0/core_data.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/occ_gpe0/core_data.c b/src/occ_gpe0/core_data.c index 7d52a75..343b5dd 100644 --- a/src/occ_gpe0/core_data.c +++ b/src/occ_gpe0/core_data.c @@ -32,6 +32,8 @@ #include "ppe42_msr.h" #include "ppe42_scom.h" #include "cme_register_addresses.h" +#include "cppm_register_addresses.h" +#include "cppm_firmware_registers.h" #include "pk.h" #define CME_VDSR_BASE (CME_SCOM_VDSR & 0x00ffffff) @@ -39,6 +41,7 @@ // Global variables uint32_t g_vdm_cache_large_droop_count[MAX_NUM_QUADS]__attribute__((section (".sbss"))); uint32_t g_vdm_core_small_droop_count[MAX_NUM_CORES]__attribute__((section (".sbss"))); +int g_fused_core = FUSED_UNKNOWN; uint32_t get_core_data(uint32_t i_core, CoreData* o_data) @@ -163,7 +166,33 @@ uint32_t get_core_data(uint32_t i_core, // Send command to select which emmpath counter to read do { - uint64_t empath_scom_data = CORE_RAW_CYCLES; + uint64_t empath_scom_data = CORE_RAW_CYCLES; + + if(FUSED_UNKNOWN == g_fused_core) + { + cppm_cpmmr_t cpmmr; + rc = getscom(coreSelect, CPPM_CPMMR, &(cpmmr.value)); + if (rc) + { + // Retry on next tick + break; + } + + if (1 == cpmmr.fields.fused_core_mode) + { + g_fused_core = FUSED_TRUE; + } + else + { + g_fused_core = FUSED_FALSE; + } + } + + if(g_fused_core == FUSED_TRUE && ((i_core % 2) != 0)) + { + empath_scom_data |= SELECT_ODD_CORE; + } + rc = putscom(coreSelect, PC_OCC_SPRC, empath_scom_data); if (rc) { |