diff mbox

[kvm-unit-tests] arm64: timer: Use correct counter for !pending_before

Message ID 20170803062545.17533-1-cdall@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Christoffer Dall Aug. 3, 2017, 6:25 a.m. UTC
We were using the virtual counter to calculate a timer cval which is 10
seconds in the future, but this obviously doesn't work for the physical
timer which is bases on the physical counter.

Make sure we use a properly paired timer/counter pair.

Reported-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
---
 arm/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Radim Krčmář Aug. 3, 2017, 1:09 p.m. UTC | #1
2017-08-03 08:25+0200, Christoffer Dall:
> We were using the virtual counter to calculate a timer cval which is 10
> seconds in the future, but this obviously doesn't work for the physical
> timer which is bases on the physical counter.
> 
> Make sure we use a properly paired timer/counter pair.
> 
> Reported-by: Andrew Jones <drjones@redhat.com>
> Signed-off-by: Christoffer Dall <cdall@linaro.org>
> ---

Applied, thanks.
diff mbox

Patch

diff --git a/arm/timer.c b/arm/timer.c
index e824338..4cdca9e 100644
--- a/arm/timer.c
+++ b/arm/timer.c
@@ -174,7 +174,7 @@  static bool test_cval_10msec(struct timer_info *info)
 
 static void test_timer(struct timer_info *info)
 {
-	u64 now = read_sysreg(cntvct_el0);
+	u64 now = info->read_counter();
 	u64 time_10s = read_sysreg(cntfrq_el0) * 10;
 	u64 later = now + time_10s;