3 files changed, 23 insertions, 28 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)
diff --git a/src/soc/nvidia/tegra132/spi.c b/src/soc/nvidia/tegra132/spi.c
index 973bdc94ea..882a6ad344 100644
--- a/src/soc/nvidia/tegra132/spi.c
+++ b/src/soc/nvidia/tegra132/spi.c
@@ -416,8 +416,7 @@ static inline u32 rx_fifo_count(struct tegra_spi_channel *spi)
 static int tegra_spi_pio_finish(struct tegra_spi_channel *spi)
 {
 	u8 *p = spi->in_buf;
-	struct mono_time start;
-	struct rela_time rt;
+	struct stopwatch sw;
 
 	clrbits_le32(&spi->regs->command1, SPI_CMD1_RX_EN | SPI_CMD1_TX_EN);
 
@@ -425,12 +424,11 @@ static int tegra_spi_pio_finish(struct tegra_spi_channel *spi)
 	 * Allow some time in case the Rx FIFO does not yet have
 	 * all packets pushed into it. See chrome-os-partner:24215.
 	 */
-	timer_monotonic_get(&start);
+	stopwatch_init_usecs_expire(&sw, SPI_FIFO_XFER_TIMEOUT_US);
 	do {
 		if (rx_fifo_count(spi) == spi_byte_count(spi))
 			break;
-		rt = current_time_from(&start);
-	} while (rela_time_in_microseconds(&rt) < SPI_FIFO_XFER_TIMEOUT_US);
+	} while (!stopwatch_expired(&sw));
 
 	while (!(read32(&spi->regs->fifo_status) &
 				SPI_FIFO_STATUS_RX_FIFO_EMPTY)) {
diff --git a/src/soc/nvidia/tegra132/timer.c b/src/soc/nvidia/tegra132/timer.c
index 4a43208f61..ed10340040 100644
--- a/src/soc/nvidia/tegra132/timer.c
+++ b/src/soc/nvidia/tegra132/timer.c
@@ -28,18 +28,18 @@ void init_timer(void)
 
 void udelay(unsigned usec)
 {
-	struct mono_time current, end;
-
-	if (!thread_yield_microseconds(usec))
-		return;
+	struct stopwatch sw;
 
 	/*
 	 * As the hardware clock granularity is in microseconds pad the
 	 * requested delay by one to get at least >= requested usec delay.
 	 */
-	timer_monotonic_get(&end);
-	mono_time_add_usecs(&end, usec + 1);
-	do {
-		timer_monotonic_get(&current);
-	} while (mono_time_before(&current, &end));
+	usec += 1;
+
+	if (!thread_yield_microseconds(usec))
+		return;
+
+	stopwatch_init_usecs_expire(&sw, usec);
+	while (!stopwatch_expired(&sw))
+		;
 }