From: Marc Zyngier <marc.zyngier@arm.com>
Date: Mon, 8 Apr 2019 15:49:02 +0000 (+0100)
Subject: watchdog/sbsa: Use arch_timer_read_counter instead of arch_counter_get_cntvct
X-Git-Tag: v5.2-rc1~184^2~1^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eae1ddc615bef9e1a1958a4b867a0a1678049bb3;p=thirdparty%2Fkernel%2Flinux.git

watchdog/sbsa: Use arch_timer_read_counter instead of arch_counter_get_cntvct

Only arch_timer_read_counter will guarantee that workarounds are
applied. So let's use this one instead of arch_counter_get_cntvct.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index e8bd9887c5663..e221e47396ab7 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -161,7 +161,7 @@ static unsigned int sbsa_gwdt_get_timeleft(struct watchdog_device *wdd)
 		timeleft += readl(gwdt->control_base + SBSA_GWDT_WOR);
 
 	timeleft += lo_hi_readq(gwdt->control_base + SBSA_GWDT_WCV) -
-		    arch_counter_get_cntvct();
+		    arch_timer_read_counter();
 
 	do_div(timeleft, gwdt->clk);