From 6e52f56bd2ccf099ccc540b60bd481c692b8591b Mon Sep 17 00:00:00 2001 From: William Bryan Date: Fri, 9 Nov 2018 16:05:13 -0600 Subject: Fix memory bandwidth chom averages CQ:SW451293 Change-Id: I221e626234dc188debbb064d276c42489a09857e Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68619 Tested-by: FSP CI Jenkins Reviewed-by: Christopher J. Cain Reviewed-by: Martha Broyles Reviewed-by: William A. Bryan --- src/occ_405/cmdh/cmdh_dbug_cmd.c | 6 +++--- src/occ_405/mem/memory.c | 2 +- src/occ_405/thread/chom.c | 12 +++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/occ_405/cmdh/cmdh_dbug_cmd.c b/src/occ_405/cmdh/cmdh_dbug_cmd.c index 6aa22b0..72ba707 100755 --- a/src/occ_405/cmdh/cmdh_dbug_cmd.c +++ b/src/occ_405/cmdh/cmdh_dbug_cmd.c @@ -956,11 +956,11 @@ void dbug_err_inject(const cmdh_fsp_cmd_t * i_cmd_ptr, if (G_rsp_status == ERRL_RC_INTERNAL_FAIL) { - TRAC_ERR("cmdh_dbug_inject_errl: Fail creating ERR Log\n"); + TRAC_ERR("cmdh_dbug_inject_errl: Fail creating ERR Log"); } else { - TRAC_INFO("cmdh_dbug_inject_errl: inject errl for COMP : %s\n", l_cmd_ptr->comp); + TRAC_INFO("cmdh_dbug_inject_errl: inject errl for COMP : %s", l_cmd_ptr->comp); } return; @@ -1090,7 +1090,7 @@ void cmdh_dbug_cmd (const cmdh_fsp_cmd_t * i_cmd_ptr, default: // Trace the rest of the debug commands. - TRAC_INFO("Debug Command: Sub:0x%02x\n", l_sub_cmd); + TRAC_INFO("Debug Command: Sub:0x%02x", l_sub_cmd); break; } diff --git a/src/occ_405/mem/memory.c b/src/occ_405/mem/memory.c index f7f692d..111407d 100644 --- a/src/occ_405/mem/memory.c +++ b/src/occ_405/mem/memory.c @@ -175,7 +175,7 @@ void task_memory_control( task_t * i_task ) g_amec->sys.dimm_m_values[mc][port].m_value = G_dimm_control_args.dimmDenominatorValues.m_value; g_amec->sys.dimm_m_values[mc][port].need_m = FALSE; - TRAC_INFO("M Value for MC%d P%d is 0x%08X", mc, port, g_amec->sys.dimm_m_values[mc][port].m_value); + MEM_DBG("M Value for MC%d P%d is 0x%08X", mc, port, g_amec->sys.dimm_m_values[mc][port].m_value); } } }//if(L_gpe_scheduled) diff --git a/src/occ_405/thread/chom.c b/src/occ_405/thread/chom.c index 2b6dd75..025a174 100755 --- a/src/occ_405/thread/chom.c +++ b/src/occ_405/thread/chom.c @@ -47,6 +47,9 @@ uint8_t g_chom_pwr_modes[OCC_INTERNAL_MODE_MAX_NUM]; // Nominal, SPS, DPS, DPS- // force immediate chom log flag uint8_t g_chom_force; +// indicates that chom data has been reset +bool g_chom_reset = FALSE; + // chom data log ChomLogData_t g_chom_log; ChomLogData_t * g_chom = &g_chom_log; @@ -149,7 +152,8 @@ void chom_data_reset() g_chom_gen_periodic_log_timer = 0; // reset flag g_chom_force = FALSE; - + // reset static data + g_chom_reset = TRUE; } @@ -171,6 +175,12 @@ void chom_update_sensors() // Use FMF as default static uint32_t * L_curNumSamplePtr = L_memBWNumSamples[CHOM_MODE_FMF]; + if(TRUE == g_chom_reset) + { + memset(L_memBWNumSamples, 0, sizeof(L_memBWNumSamples)); + g_chom_reset = FALSE; + } + uint16_t i = 0, j = 0; // Is the current mode different than previous poll -- cgit v1.2.1