diff options
author | William Bryan <wilbryan@us.ibm.com> | 2017-01-16 14:34:53 -0600 |
---|---|---|
committer | William A. Bryan <wilbryan@us.ibm.com> | 2017-02-15 18:50:20 -0500 |
commit | 61ebd774170f72a53a838944f6d3204c87638694 (patch) | |
tree | 2933c7a03f5f564509f7c69f07d0e449219edb47 /src/occ_405/pss | |
parent | 6ff7b2615b6eb6c19f64babf7a724923c12c34b3 (diff) | |
download | talos-occ-61ebd774170f72a53a838944f6d3204c87638694.tar.gz talos-occ-61ebd774170f72a53a838944f6d3204c87638694.zip |
Changes For P9 Enablement
Change-Id: I37e8174bcc6e99f602a66cff077ef41ad889b19c
RTC:165351
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34949
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/pss')
-rwxr-xr-x | src/occ_405/pss/apss.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/occ_405/pss/apss.c b/src/occ_405/pss/apss.c index e979477..76d813c 100755 --- a/src/occ_405/pss/apss.c +++ b/src/occ_405/pss/apss.c @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -47,7 +47,7 @@ const apssGpioConfigStruct_t G_gpio_config[2] = { {0x00, 0xFF, 0x00}, {0x00, 0xF // G_apss_mode_config: system parms needed to select correct mode command options // Configure streaming of: APSS Mode, 16 ADCs, 2 GPIOs -const apssModeConfigStruct_t G_apss_mode_config = { APSS_MODE_COMPOSITE, 16, 2 }; +const apssModeConfigStruct_t G_apss_mode_config = { APSS_MODE_AUTO2, 16, 2 }; // Power Measurements (read from APSS every RealTime loop) apssPwrMeasStruct_t G_apss_pwr_meas = { {0} }; @@ -60,7 +60,7 @@ uint64_t G_gpe_apss_time_end; // Flag for requesting APSS recovery when OCC detects all zeroes or data out of sync bool G_apss_recovery_requested = FALSE; - +bool G_apss_data_traced = FALSE; GPE_BUFFER(apss_start_args_t G_gpe_start_pwr_meas_read_args); GPE_BUFFER(apss_continue_args_t G_gpe_continue_pwr_meas_read_args); GPE_BUFFER(apss_complete_args_t G_gpe_complete_pwr_meas_read_args); @@ -152,10 +152,13 @@ void do_apss_recovery(void) uint64_t l_spi_adc_reset; uint64_t l_spi_adc_wdata; - - INTR_TRAC_ERR("detected invalid power data[%08x%08x]", + if (!G_apss_data_traced) + { + INTR_TRAC_ERR("detected invalid power data[%08x%08x]", (uint32_t)(G_gpe_continue_pwr_meas_read_args.meas_data[0] >> 32), (uint32_t)(G_gpe_continue_pwr_meas_read_args.meas_data[0] & 0x00000000ffffffffull)); + G_apss_data_traced = TRUE; + } do { @@ -344,7 +347,8 @@ void task_apss_start_pwr_meas(struct task *i_self) if(G_apss_recovery_requested) { // Do recovery then wait until next tick to do anything more. - do_apss_recovery(); +// TODO: RTC: 163275 Cannot SCOM from the 405. Move to GPE. +// do_apss_recovery(); break; } @@ -674,6 +678,10 @@ void reformat_meas_data() G_apss_recovery_requested = TRUE; break; } + else + { + G_apss_data_traced = FALSE; + } // Decrement up/down fail counter for backup on success. if(G_backup_fail_count) |