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/include | |
| 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/include')
| -rw-r--r-- | src/include/core_data.h | 8 | ||||
| -rw-r--r-- | src/include/registers/cppm_firmware_registers.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/include/core_data.h b/src/include/core_data.h index 1149000..138e126 100644 --- a/src/include/core_data.h +++ b/src/include/core_data.h @@ -39,6 +39,7 @@ #define TOD_VALUE_REG 0x00040020 #define STOP_STATE_HIST_OCC_REG 0x000F0112 +#define SELECT_ODD_CORE 0x100 #define CORE_RAW_CYCLES 0x200 #define CORE_RUN_CYCLES 0x208 #define CORE_WORKRATE_BUSY 0x210 @@ -88,6 +89,13 @@ #define WORKAROUND_SCOM_ADDRESS 0x10800 +typedef enum +{ + FUSED_UNKNOWN, + FUSED_FALSE, + FUSED_TRUE +} FusedCore; + typedef struct { uint32_t tod_2mhz; diff --git a/src/include/registers/cppm_firmware_registers.h b/src/include/registers/cppm_firmware_registers.h index 67078c9..9eeb54e 100644 --- a/src/include/registers/cppm_firmware_registers.h +++ b/src/include/registers/cppm_firmware_registers.h @@ -61,7 +61,9 @@ typedef union cppm_cpmmr { #ifdef _BIG_ENDIAN uint64_t ppm_write_disable : 1; uint64_t ppm_write_override : 1; - uint64_t reserved1 : 10; + uint64_t reserved0 : 7; + uint64_t fused_core_mode : 1; + uint64_t reserved1 : 2; uint64_t cme_err_notify_dis : 1; uint64_t wkup_notify_select : 1; uint64_t enable_pece : 1; @@ -73,7 +75,9 @@ typedef union cppm_cpmmr { uint64_t enable_pece : 1; uint64_t wkup_notify_select : 1; uint64_t cme_err_notify_dis : 1; - uint64_t reserved1 : 10; + uint64_t reserved1 : 2; + uint64_t fused_core_mode : 1; + uint64_t reserved0 : 7; uint64_t ppm_write_override : 1; uint64_t ppm_write_disable : 1; #endif // _BIG_ENDIAN |
