diff options
| author | Stephen Glancy <sglancy@us.ibm.com> | 2017-04-19 10:23:57 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-07 22:09:35 -0400 |
| commit | d0c2ed576770ca6ac8ea77bee118fecc72614451 (patch) | |
| tree | a03831688e1e58048886a235ce5cf08fca0fc0bb /src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H | |
| parent | 2beb5810ed764391d2e085e78884c1d2d6b67f1d (diff) | |
| download | talos-hostboot-d0c2ed576770ca6ac8ea77bee118fecc72614451.tar.gz talos-hostboot-d0c2ed576770ca6ac8ea77bee118fecc72614451.zip | |
Fixes RD VREF runtime calculation
Change-Id: Ie24cb609dfea8ed53406b7c231129ccb40b8ddc1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39773
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39808
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H index e7bb30248..c1a465fc9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H @@ -215,7 +215,8 @@ inline fapi2::ReturnCode cal_timer_setup(const fapi2::Target<T>& i_target, l_total_cycles += i_cal_steps_enabled.getBit<WRITE_CTR>() ? l_write_cntr_cycles : 0; l_total_cycles += i_cal_steps_enabled.getBit<COARSE_WR>() ? coarse_wr_cycles(i_target) : 0; l_total_cycles += i_cal_steps_enabled.getBit<COARSE_RD>() ? coarse_rd_cycles(i_target) : 0; - l_total_cycles += i_cal_steps_enabled.getBit<READ_CTR_2D_VREF>() ? rc::vref_guess_time(i_target) : 0; + l_total_cycles += ((l_vref_cal_enable != 0) + && i_cal_steps_enabled.getBit<READ_CTR_2D_VREF>()) ? rc::vref_guess_time(i_target) : 0; // Now we have to decide if we're going to abort on an error or keep going. If we keep going, // then we want our initial delay to be the expected time to completion - we don't have much @@ -251,7 +252,7 @@ inline fapi2::ReturnCode cal_timer_setup(const fapi2::Target<T>& i_target, // Fudge some for sim irregularities. This will increase time to a complete timeout but won't // really effect valid training unless these cycles are needed. So this isn't a bad thing ... // AKA watchdog timer - i_poll.iv_poll_count *= 10; + i_poll.iv_poll_count *= 2; FAPI_INF("cal abort on error? %s. tc: %luc, id: %luns(%lusc), d: %lu(%lusc), pc: %lu", (cal_abort_on_error ? "yup" : "nope"), l_total_cycles, i_poll.iv_initial_delay, |
