watchdog: sprd: change to use usleep_range() instead of busy loop (2a6c9c65) · Commits · 戴 / test

After changing to check busy bit for the previous loading operation instead of the current one, for most of cases, the busy bit is not set for the first time of read, so there's no need to check so frequently, so this patch use usleep_range() to replace cpu_relax() to avoid busy loop. Also this patch change the max times to 11 which would be enough, since according to the specification, the busy bit would be set after a new loading operation and last 2 or 3 RTC clock cycles (about 60us~92us). Fixes: ("watchdog: Add Spreadtrum watchdog driver") Original-by:

Lingling Xu <ling_ling.xu@unisoc.com> Signed-off-by:

Chunyan Zhang <chunyan.zhang@unisoc.com> Reviewed-by:

Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20201029023933.24548-4-zhang.lyra@gmail.com Signed-off-by:

Guenter Roeck <linux@roeck-us.net> Signed-off-by:

Wim Van Sebroeck <wim@linux-watchdog.org>

drivers/watchdog/sprd_wdt.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@

		#include <linux/bitops.h>
		#include <linux/clk.h>
		#include <linux/delay.h>
		#include <linux/device.h>
		#include <linux/err.h>
		#include <linux/interrupt.h>
		@@ -53,7 +54,7 @@

		#define SPRD_WDT_CNT_HIGH_SHIFT 16
		#define SPRD_WDT_LOW_VALUE_MASK GENMASK(15, 0)
		#define SPRD_WDT_LOAD_TIMEOUT 1000
		#define SPRD_WDT_LOAD_TIMEOUT 11

		struct sprd_wdt {
		void __iomem *base;
		@@ -109,15 +110,17 @@ static int sprd_wdt_load_value(struct sprd_wdt *wdt, u32 timeout,
		u32 prtmr_step = pretimeout * SPRD_WDT_CNT_STEP;

		/*
		* Waiting the load value operation done,
		* it needs two or three RTC clock cycles.
		* Checking busy bit to make sure the previous loading operation is
		* done. According to the specification, the busy bit would be set
		* after a new loading operation and last 2 or 3 RTC clock
		* cycles (about 60us~92us).
		*/
		do {
		val = readl_relaxed(wdt->base + SPRD_WDT_INT_RAW);
		if (!(val & SPRD_WDT_LD_BUSY_BIT))
		break;

		cpu_relax();
		usleep_range(10, 100);
		} while (delay_cnt++ < SPRD_WDT_LOAD_TIMEOUT);

		if (delay_cnt >= SPRD_WDT_LOAD_TIMEOUT)

Admin message