wdt: dw: Switch to using fls for log2
Subsystems (2)
PATCH v2 1/7 wdt: dw: Switch to using fls for log2
log_2_n_round_up is only found in arm. fls performs the same job and is generic.
---
Changes in v2:
- Fix fls being off-by-one when compared to log_2_n_round_up
drivers/watchdog/designware_wdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/designware_wdt.c +1 -2
@@ -9,7 +9,6 @@#include <reset.h> #include <wdt.h> #include <asm/io.h> -#include <asm/utils.h> #include <linux/bitops.h> #define DW_WDT_CR 0x00
@@ -35,7 +34,7 @@ static int designware_wdt_settimeout(void __iomem *base, unsigned int clk_khz,signed int i;/* calculate the timeout range value */ - i =log_2_n_round_up (timeout * clk_khz) -16 ; + i =fls (timeout * clk_khz -1 ) -16 ; i =clamp (i,0 ,15 );writel (i | (i <<4 ), base +DW_WDT_TORR );
Signature · 1 line
2.28.0
PATCH v2 2/7 wdt: dw: Switch to if(CONFIG()) instead of using #if
This is preferred over #if because the compiler can check syntax even if the feature is disabled. This cannot be used for CONFIG_CLK because CONFIG_DW_WDT_CLOCK_KHZ is not defined on all platforms.
---
(no changes since v1)
drivers/watchdog/designware_wdt.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/watchdog/designware_wdt.c +9 -9
@@ -136,17 +136,17 @@ static int designware_wdt_probe(struct udevice *dev) priv->clk_khz =CONFIG_DW_WDT_CLOCK_KHZ ;#endif -#if CONFIG_IS_ENABLED (DM_RESET ) -struct reset_ctl_bulk resets; +if (CONFIG_IS_ENABLED (DM_RESET )) { +struct reset_ctl_bulk resets; - ret =reset_get_bulk (dev, &resets); -if (ret) -return ret; + ret =reset_get_bulk (dev, &resets); +if (ret) +return ret; - ret =reset_deassert_bulk (&resets); -if (ret) -return ret; -#endif + ret =reset_deassert_bulk (&resets); +if (ret) +return ret; + }/* reset to disable the watchdog */ return designware_wdt_stop (dev);
Signature · 1 line
2.28.0
PATCH v2 3/7 wdt: dw: Fix clock rate being off by 1000
In reply to Sean AndersonThe clock subsystem returns clock rates in Hz. We need to divide by 1000 so the rate is in kHz.
---
(no changes since v1)
drivers/watchdog/designware_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/designware_wdt.c +1 -1
@@ -129,7 +129,7 @@ static int designware_wdt_probe(struct udevice *dev)if (ret)return ret; - priv->clk_khz =clk_get_rate (&clk); + priv->clk_khz =clk_get_rate (&clk) /1000 ;if (!priv->clk_khz)return -EINVAL ;#else
Signature · 1 line
2.28.0
PATCH v2 4/7 wdt: dw: Enable the clock before using it
In reply to Sean AndersonThe watchdog won't work if the clock isn't enabled.
---
(no changes since v1)
drivers/watchdog/designware_wdt.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/watchdog/designware_wdt.c +4 -0
@@ -129,6 +129,10 @@ static int designware_wdt_probe(struct udevice *dev)if (ret)return ret; + ret =clk_enable (&clk); +if (ret) +return ret; + priv->clk_khz =clk_get_rate (&clk) /1000 ;if (!priv->clk_khz)return -EINVAL ;
Signature · 1 line
2.28.0
PATCH v2 5/7 wdt: dw: Free the clock on error
In reply to Sean AndersonThe clock subsystem requires that clk_free be called on clocks obtained via clk_get_*.
---
(no changes since v1)
drivers/watchdog/designware_wdt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/watchdog/designware_wdt.c +12 -5
@@ -131,11 +131,13 @@ static int designware_wdt_probe(struct udevice *dev) ret =clk_enable (&clk);if (ret) -return ret; + goto err; priv->clk_khz =clk_get_rate (&clk) /1000 ; -if (!priv->clk_khz) -return -EINVAL ; +if (!priv->clk_khz) { + ret = -EINVAL ; + goto err; + }#else priv->clk_khz =CONFIG_DW_WDT_CLOCK_KHZ ;#endif
@@ -145,15 +147,20 @@ static int designware_wdt_probe(struct udevice *dev) ret =reset_get_bulk (dev, &resets);if (ret) -return ret; + goto err; ret =reset_deassert_bulk (&resets);if (ret) -return ret; + goto err; }/* reset to disable the watchdog */ return designware_wdt_stop (dev); + +err: +if (CONFIG_IS_ENABLED (CLK )) +clk_free (&clk); +return ret; }static const struct wdt_ops designware_wdt_ops = {
Signature · 1 line
2.28.0
PATCH v2 6/7 riscv: Add watchdog bindings for the k210
In reply to Sean AndersonThis adds the necessary bindings. Most of them are already there.
---
Changes in v2:
- Move watchdog enable to k210.dtsi as it does not depend on anything board-specific.
arch/riscv/dts/k210.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/riscv/dts/k210.dtsi +0 -1
@@ -425,7 +425,6 @@ interrupts = <21>; clocks = <&sysclk K210_CLK_WDT0>; resets = <&sysrst K210_RST_WDT0>; - status = "disabled"; }; wdt1: watchdog at 50410000 {
Signature · 1 line
2.28.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 6/7 riscv: Add watchdog bindings for the k210
Quoted 9 lines
From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Sean Anderson
Sent: Friday, August 07, 2020 11:04 PM
To: u-boot at lists.denx.de
Cc: Heinrich Schuchardt; Marek Vasut; Simon Glass; Jagan Teki; Bin Meng; Sean Anderson
Subject: [PATCH v2 6/7] riscv: Add watchdog bindings for the k210This adds the necessary bindings. Most of them are already there.
Signed-off-by Sean Anderson <[email protected]>
Quoted 9 lines
---
Changes in v2:
- Move watchdog enable tok210.dtsias it does not depend on anything board-specific.arch/riscv/dts/k210.dtsi | 1 - 1 file changed, 1 deletion(-)
PATCH v2 7/7 riscv: Enable watchdog for the k210
In reply to Sean AndersonThis enables the necessary config options.
---
(no changes since v1)
board/sipeed/maix/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
board/sipeed/maix/Kconfig +2 -0
@@ -44,4 +44,6 @@ config BOARD_SPECIFIC_OPTIONS imply RESET_SYSCON imply SYSRESET imply SYSRESET_SYSCON + imply WDT + imply DESIGNWARE_WATCHDOG endif
Signature · 1 line
2.28.0