diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2014-09-23 16:33:21 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-03-21 17:01:12 +0100 |
| commit | b9894efb86fd8b37aabaaea5bd19bac47c1438f0 (patch) | |
| tree | c5871383609fd0877011215a29dfa0b4606c1f22 /src/soc/nvidia/tegra132/ccplex.c | |
| parent | 43933466e74dbdeb38ba8f5882ae8ed2372e3e4b (diff) | |
tegra132: convert to stopwatch API
Simplify the timed operations by using the stopwatch API.
BUG=None
BRANCH=None
TEST=Built and booted to kernel. Analyzed logs. Output as expected.
Change-Id: Ia49bccccc412f23bb620ed386b9174468a434116
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: a877020c6d8ba12422c9c2c487122b7eb4a1967b
Original-Change-Id: Iffc32fcb9b8bfdcfbef67f563ac3014912f82e7f
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/219494
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/8831
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/soc/nvidia/tegra132/ccplex.c')
| -rw-r--r-- | src/soc/nvidia/tegra132/ccplex.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/soc/nvidia/tegra132/ccplex.c b/src/soc/nvidia/tegra132/ccplex.c index 9f857070e0..90818b5515 100644 --- a/src/soc/nvidia/tegra132/ccplex.c +++ b/src/soc/nvidia/tegra132/ccplex.c @@ -38,9 +38,8 @@ static int ccplex_start(void) { - struct mono_time t1, t2; - const long timeout_us = 1500000; - long wait_time; + struct stopwatch sw; + const long timeout_ms = 1500; const uint32_t handshake_mask = 1; const uint32_t cxreset1_mask = 1 << 21; uint32_t reg; @@ -55,24 +54,22 @@ static int ccplex_start(void) reg |= cxreset1_mask; write32(reg, &clk_rst->rst_cpu_cmplx_set); - timer_monotonic_get(&t1); + stopwatch_init_msecs_expire(&sw, timeout_ms); while (1) { reg = read32(&pmc->scratch118); - timer_monotonic_get(&t2); - - wait_time = mono_time_diff_microseconds(&t1, &t2); /* Wait for the bit to be knocked down. */ if ((reg & handshake_mask) != handshake_mask) break; - if (wait_time >= timeout_us) { + if (stopwatch_expired(&sw)) { printk(BIOS_DEBUG, "MTS handshake timeout.\n"); return -1; } } - printk(BIOS_DEBUG, "MTS handshake took %ld us.\n", wait_time); + printk(BIOS_DEBUG, "MTS handshake took %ld us.\n", + stopwatch_duration_usecs(&sw)); return 0; } @@ -140,7 +137,7 @@ static void request_ram_repair(void) const uint32_t req = 1 << 0; const uint32_t sts = 1 << 1; uint32_t reg; - struct mono_time t1, t2; + struct stopwatch sw; printk(BIOS_DEBUG, "Requesting RAM repair.\n"); @@ -148,12 +145,12 @@ static void request_ram_repair(void) reg |= req; write32(reg, &flow->ram_repair); - timer_monotonic_get(&t1); - while ((read32(&flow->ram_repair) & sts) != sts); - timer_monotonic_get(&t2); + stopwatch_init(&sw); + while ((read32(&flow->ram_repair) & sts) != sts) + ; printk(BIOS_DEBUG, "RAM repair complete in %ld usecs.\n", - mono_time_diff_microseconds(&t1, &t2)); + stopwatch_duration_usecs(&sw)); } void ccplex_cpu_prepare(void) |