Re: [PATCH v2 2/3] drivers: watchdog: Add StarFive Watchdog driver

Xingyu Wu
2023-02-10T07:06:32Z

On 2023/2/2 6:46, Guenter Roeck wrote:
> On Mon, Dec 19, 2022 at 05:42:32PM +0800, Xingyu Wu wrote:
>> Add watchdog driver for the StarFive JH7110 SoC.
>>
>> Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>
>
> This driver is almost impossible for me to review. There is a lot of code
> which doesn't make sense to me. I'll outline some of it below, but this is
> by far not a complete review.

Thanks for your review. It is enough complete and useful.

>
>>[...]
>> +
>> +#include <linux/clk.h>
>> +#include <linux/delay.h>
>> +#include <linux/err.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/io.h>
>> +#include <linux/iopoll.h>
>> +#include <linux/module.h>
>> +#include <linux/moduleparam.h>
>> +#include <linux/of.h>
>> +#include <linux/of_device.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/pm_runtime.h>
>> +#include <linux/reset.h>
>> +#include <linux/reset-controller.h>
>> +#include <linux/slab.h>
>> +#include <linux/timer.h>
>> +#include <linux/types.h>
>> +#include <linux/uaccess.h>
>> +#include <linux/watchdog.h>
>
> Several of those include files are unnecessary.

Will drop it.

>
>> [...]
>> +
>> +static bool nowayout = WATCHDOG_NOWAYOUT;
>> +static int tmr_margin;
>> +static int tmr_atboot = STARFIVE_WDT_ATBOOT;
>> +static int soft_noboot;
>> +
>> +module_param(tmr_margin, int, 0);
>> +module_param(tmr_atboot, int, 0);
>> +module_param(nowayout, bool, 0);
>> +module_param(soft_noboot, int, 0);
>> +
>> +MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default="
>> + __MODULE_STRING(STARFIVE_WDT_DEFAULT_TIME) ")");
>
> Use "timeout" or "heartbeat".

Will fix.

>
>> +MODULE_PARM_DESC(tmr_atboot,
>> + "Watchdog is started at boot time if set to 1, default="
>> + __MODULE_STRING(STARFIVE_WDT_ATBOOT));
>
> Use "early_enable"

Will fix.

>
>> +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
>> + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
>> +MODULE_PARM_DESC(soft_noboot,
>> + "Watchdog action, set to 1 to ignore reboots, 0 to reboot (default 0)");
>
> I do not understand what this module parameter is supposed to be used for,
> and what the "soft_' prefix is supposed to mean.

This 'soft_noboot' means watchdog reset enabled status. If 'soft_noboot' is set to 1,
it means reset is disabled and do not reboot.Or 'reboot_disbled' instead?

>
>> [...]
>> +#ifdef CONFIG_OF
>> +/* Register bias in JH7110 */
>> +static const struct starfive_wdt_variant drv_data_jh7110 = {
>> + .control = STARFIVE_WDT_JH7110_CONTROL,
>> + .load = STARFIVE_WDT_JH7110_LOAD,
>> + .enable = STARFIVE_WDT_JH7110_CONTROL,
>> + .value = STARFIVE_WDT_JH7110_VALUE,
>> + .int_clr = STARFIVE_WDT_JH7110_INTCLR,
>> + .unlock = STARFIVE_WDT_JH7110_LOCK,
>> + .unlock_key = STARFIVE_WDT_JH7110_UNLOCK_KEY,
>> + .irq_is_raise = STARFIVE_WDT_JH7110_IMS,
>> + .enrst_shift = STARFIVE_WDT_JH7110_RESEN_SHIFT,
>> + .en_shift = STARFIVE_WDT_JH7110_EN_SHIFT,
>> +};
>> +
>> +static const struct of_device_id starfive_wdt_match[] = {
>> + { .compatible = "starfive,jh7110-wdt", .data = &drv_data_jh7110 },
>> + {}
>> +};
>> +MODULE_DEVICE_TABLE(of, starfive_wdt_match);
>> +#endif
>> +
>> +static const struct platform_device_id starfive_wdt_ids[] = {
>> + {
>> + .name = "starfive-jh7110-wdt",
>> + .driver_data = (unsigned long)&drv_data_jh7110,
>
> This will fail to compile if CONFIG_OF=n.

Will drop '#ifdef CONFIG_OF'.

>
>> + },
>> + {}
>> +};
>> +MODULE_DEVICE_TABLE(platform, starfive_wdt_ids);
>> +
>> +static int starfive_wdt_get_clock_rate(struct starfive_wdt *wdt)
>> +{
>> + if (!IS_ERR(wdt->core_clk)) {
>> + wdt->freq = clk_get_rate(wdt->core_clk);
>
> wdt->freq can at least in theory be 0, which would
> result in a zero-divide crash later on.

Will add a check whether rate is 0 to avoid zero-divide crash.

>
>> + return 0;
>> + }
>> + dev_err(wdt->dev, "get clock rate failed.\n");
>> +
>> + return -ENOENT;
>
> The above code can not be reached.
>
>> +}
>> +
>> +static int starfive_wdt_enable_clock(struct starfive_wdt *wdt)
>> +{
>> + int ret = 0;
>> +
>> + wdt->apb_clk = devm_clk_get_enabled(wdt->dev, "apb");
>> + if (IS_ERR(wdt->apb_clk)) {
>> + dev_err(wdt->dev, "failed to get and enable apb clock.\n");
>> + ret = PTR_ERR(wdt->apb_clk);
>> + return ret;
>> + }
>> +
>> + wdt->core_clk = devm_clk_get_enabled(wdt->dev, "core");
>> + if (IS_ERR(wdt->core_clk)) {
>> + dev_err(wdt->dev, "failed to get and enable core clock.\n");
>> + ret = PTR_ERR(wdt->core_clk);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static int starfive_wdt_reset_init(struct starfive_wdt *wdt)
>> +{
>> + int ret = 0;
>> +
>> + wdt->rsts = devm_reset_control_array_get_exclusive(wdt->dev);
>> + if (!IS_ERR(wdt->rsts)) {
>
> Error handling should come first, and return immediately.

Will change the order and return error first.

>
>> + ret = reset_control_deassert(wdt->rsts);
>> + if (ret)
>> + dev_err(wdt->dev, "failed to deassert rsts.\n");
>> + } else {
>> + dev_err(wdt->dev, "failed to get rsts error.\n");
>> + ret = PTR_ERR(wdt->rsts);
>> + }
>> +
>> + return ret;
>> +}
>> [...]
>> +
>> +/* interrupt status whether has been raised from the counter */
>> +static bool starfive_wdt_raise_irq_status(struct starfive_wdt *wdt)
>> +{
>> + return !!readl(wdt->base + wdt->drv_data->irq_is_raise);
>> +}
>> +
>> +static void starfive_wdt_int_clr(struct starfive_wdt *wdt)
>> +{
>> + writel(STARFIVE_WDT_INTCLR, wdt->base + wdt->drv_data->int_clr);
>> +}
>
> There is no explanation for this interrupt handling (or, rather,
> non-handling since there is no interrupt handler. What is the purpose
> of even having all this code ?

Because the watchdog raise an interrupt signal on the hardware when timeout,
although we do not use interrupt handler on the sorfware, but the watchdog
initialization or reload also need to clear the hardware interrupt signal.

>
>> [...]
>> +
>> +static unsigned int starfive_wdt_max_timeout(struct starfive_wdt *wdt)
>> +{
>> + return DIV_ROUND_UP(STARFIVE_WDT_MAXCNT, wdt->freq) - 1;
>> +}
>
> For a frequency of 1 MHz, this results in a maximum timeout of 4294.
>
> This value is then used in starfive_wdt_set_timeout(), but as
> (4294 * 1000000) / 2, which is then again compared against
> STARFIVE_WDT_MAXCNT. Somewhere this calculation is wrong.

Modify to 'DIV_ROUND_UP(STARFIVE_WDT_MAXCNT, (wdt->freq / 2)) - 1'.

>
> [...]
>> +
>> +static int starfive_wdt_restart(struct watchdog_device *wdd, unsigned long action,
>> + void *data)
>> +{
>> + struct starfive_wdt *wdt = watchdog_get_drvdata(wdd);
>> +
>> + spin_lock(&wdt->lock);
>> + starfive_wdt_unlock(wdt);
>> + /* disable watchdog, to be safe */
>> + starfive_wdt_disable(wdt);
>> +
>> + if (soft_noboot)
>> + starfive_wdt_disable_reset(wdt);
>> + else
>> + starfive_wdt_enable_reset(wdt);
>> +
>
> This is a _restart_ handler. Disabling it doesn't make any sense.

Will drop 'starfive_wdt_disable_reset(wdt)' part.

>
>> + /* put native values into count */
>> + starfive_wdt_set_count(wdt, wdt->count);
>> +
>> + /* set the watchdog to go and reset */
>> + starfive_wdt_int_clr(wdt);
>> + starfive_wdt_enable(wdt);
>> +
>> + starfive_wdt_lock(wdt);
>> + spin_unlock(&wdt->lock);
>> +
>> + return 0;
>> +}
>> +
>> +static int starfive_wdt_set_timeout(struct watchdog_device *wdd,
>> + unsigned int timeout)
>> +{
>> + struct starfive_wdt *wdt = watchdog_get_drvdata(wdd);
>> +
>> + unsigned long freq = wdt->freq;
>> + unsigned int count;
>> +
>> + spin_lock(&wdt->lock);
>> +
>> + if (timeout < wdt->wdt_device.min_timeout)
>> + return -EINVAL;
>
> This is checked by the watchdog core.

Will drop it.

>
>> +
>> + /*
>> + * This watchdog takes twice timeouts to reset.
>> + * In order to reduce time to reset, should set half count value.
>> + */
>> + count = timeout * freq / 2;
>> +
>> + if (count > STARFIVE_WDT_MAXCNT) {
>
> count is an unsigned int, which is pretty much everywhere a 32-bit
> value. STARFIVE_WDT_MAXCNT is 0xffffffff. How is an unsigned integer
> ever supposed to be larger than 0xffffffff ?
>
>> + dev_warn(wdt->dev, "timeout %d too big,use the MAX-timeout set.\n",
>> + timeout);
>> + timeout = starfive_wdt_max_timeout(wdt);
>> + count = timeout * freq;
>
> This is confusing. First, the timeout range is checked by the calling code,
> which makes sure it is never larger than max_timeout. max_timeout is
> set to the value returned by starfive_wdt_max_timeout().
> Thus, count = timeout * freq / 2 will _never_ be larger than
> STARFIVE_WDT_MAXCNT. Even if it ever was, it doesn't make sense
> to use a count value of timeout * freq in that case, ie a value which
> could be twice as large as the supposed maximum value.

Change 'count' type to 'u64'. And if 'count' is larger than STARFIVE_WDT_MAXCNT,
'count' is equal to STARFIVE_WDT_MAXCNT. Does that seem OK?

>
>> + }
>> +
>> + dev_info(wdt->dev, "Heartbeat: timeout=%d, count/2=%d (%08x)\n",
>> + timeout, count, count);
>
> No. Drop such noise. Make it a debug message if you think you need it.

Will modify it to 'dev_dbg'.

>
>> +
>> + starfive_wdt_unlock(wdt);
>> + starfive_wdt_disable(wdt);
>> + starfive_wdt_set_reload_count(wdt, count);
>> + starfive_wdt_enable(wdt);
>> + starfive_wdt_lock(wdt);
>> +
>> + wdt->count = count;
>> + wdd->timeout = timeout;
>> +
>> + spin_unlock(&wdt->lock);
>> +
>> + return 0;
>> +}
>> +
>> +#define OPTIONS (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
>> +
>> +static const struct watchdog_info starfive_wdt_ident = {
>> + .options = OPTIONS,
>> + .firmware_version = 0,
>
> It is not necessary to initilize a static variable with 0.

Will drop '0'.

>
>> + .identity = "StarFive Watchdog",
>> +};
>> +
>> +static const struct watchdog_ops starfive_wdt_ops = {
>> + .owner = THIS_MODULE,
>> + .start = starfive_wdt_start,
>> + .stop = starfive_wdt_pm_stop,
>> + .ping = starfive_wdt_keepalive,
>> + .set_timeout = starfive_wdt_set_timeout,
>> + .restart = starfive_wdt_restart,
>> + .get_timeleft = starfive_wdt_get_timeleft,
>> +};
>> +
>> +static const struct watchdog_device starfive_wdd = {
>> + .info = &starfive_wdt_ident,
>> + .ops = &starfive_wdt_ops,
>> + .timeout = STARFIVE_WDT_DEFAULT_TIME,
>> +};
>> +
>> +static inline const struct starfive_wdt_variant *
>> +starfive_wdt_get_drv_data(struct platform_device *pdev)
>> +{
>> + const struct starfive_wdt_variant *variant;
>> +
>> + variant = of_device_get_match_data(&pdev->dev);
>> + if (!variant) {
>> + /* Device matched by platform_device_id */
>> + variant = (struct starfive_wdt_variant *)
>> + platform_get_device_id(pdev)->driver_data;
>> + }
>> +
>> + return variant;
>> +}
>> +
>> +static int starfive_wdt_probe(struct platform_device *pdev)
>> +{
>> + struct device *dev = &pdev->dev;
>> + struct starfive_wdt *wdt;
>> + int started = 0;
>
> What is this variable supposed to be used for ? It is alway 0.

This variable is used to switch for debugging whether to allow the watchdog
to be started at boot time by driver. I think I should remove it.

>
>> [...]
>> +
>> + if (tmr_atboot && started == 0) {
>> + starfive_wdt_start(&wdt->wdt_device);
>> + } else if (!tmr_atboot) {
>> + /*
>> + *if we're not enabling the watchdog, then ensure it is
>> + * disabled if it has been left running from the bootloader
>> + * or other source.
>> + */
>> + starfive_wdt_stop(&wdt->wdt_device);
>
> If it _is_ running from the boot loader, the watchdog core is not
> informed about it. If it is started here, it is not informed either.
> This is unusual and will need to be explained.
> Why ?

Is is okay to remove the 'started'?

>
>> + }
>> +
>> +#ifdef CONFIG_PM
>> + clk_disable_unprepare(wdt->core_clk);
>> + clk_disable_unprepare(wdt->apb_clk);
>> +#endif
>
> I do not understand the above code. Why stop the watchdog if CONFIG_PM
> is enabled, even if it is supposed to be running ?

There misses a check about 'early_enable' and add 'if (!early_enable)'.
There means that disable clock when watchdog sleep and CONFIG_PM is enable.
Then enable clock when watchdog work by 'starfive_wdt_runtime_resume' function.

>
>> +
>> + platform_set_drvdata(pdev, wdt);
>> +
>> + return 0;
>> +
>> +err_clk_disable:
>> + clk_disable_unprepare(wdt->core_clk);
>> + clk_disable_unprepare(wdt->apb_clk);
>> +
>> + return ret;
>> +}
>> +
>> +static int starfive_wdt_remove(struct platform_device *dev)
>> +{
>> + struct starfive_wdt *wdt = platform_get_drvdata(dev);
>> +
>> + starfive_wdt_mask_and_disable_reset(wdt, true);
>> + watchdog_unregister_device(&wdt->wdt_device);
>> +
>> + clk_disable_unprepare(wdt->core_clk);
>> + clk_disable_unprepare(wdt->apb_clk);
>> + pm_runtime_disable(wdt->dev);
>> +
>> + return 0;
>> +}
>> +
>> +static void starfive_wdt_shutdown(struct platform_device *dev)
>> +{
>> + struct starfive_wdt *wdt = platform_get_drvdata(dev);
>> +
>> + starfive_wdt_mask_and_disable_reset(wdt, true);
>> +
>> + starfive_wdt_pm_stop(&wdt->wdt_device);
>> +}
>> +
>> +#ifdef CONFIG_PM_SLEEP
>> +static int starfive_wdt_suspend(struct device *dev)
>> +{
>> + int ret;
>> + struct starfive_wdt *wdt = dev_get_drvdata(dev);
>> +
>> + starfive_wdt_unlock(wdt);
>> +
>> + /* Save watchdog state, and turn it off. */
>> + wdt->reload = starfive_wdt_get_count(wdt);
>> +
>> + starfive_wdt_mask_and_disable_reset(wdt, true);
>> +
>> + /* Note that WTCNT doesn't need to be saved. */
>> + starfive_wdt_stop(&wdt->wdt_device);
>> + pm_runtime_force_suspend(dev);
>> +
>> + starfive_wdt_lock(wdt);
>> +
>> + return 0;
>> +}
>> +
>> +static int starfive_wdt_resume(struct device *dev)
>> +{
>> + int ret;
>> + struct starfive_wdt *wdt = dev_get_drvdata(dev);
>> +
>> + starfive_wdt_unlock(wdt);
>> +
>> + pm_runtime_force_resume(dev);
>> +
>> + /* Restore watchdog state. */
>> + starfive_wdt_set_reload_count(wdt, wdt->reload);
>> +
>> + starfive_wdt_restart(&wdt->wdt_device, 0, NULL);
>
> I do not understand this call. Per its definition it is a restart handler,
> supposed to restart the hardware. Why would anyone want to restart the
> system on resume ?

The watchdog start counting from 'count' to 0 on everytime resume like a restart.
So I directly use a restart.

>
>> +
>> + starfive_wdt_mask_and_disable_reset(wdt, false);
>> +
>> + starfive_wdt_lock(wdt);
>> +
>> + return 0;
>> +}
>> +#endif /* CONFIG_PM_SLEEP */
>> +
>> +#ifdef CONFIG_PM
>> +static int starfive_wdt_runtime_suspend(struct device *dev)
>> +{
>> + struct starfive_wdt *wdt = dev_get_drvdata(dev);
>> +
>> + clk_disable_unprepare(wdt->apb_clk);
>> + clk_disable_unprepare(wdt->core_clk);
>> +
>> + return 0;
>> +}
>> +
>> +static int starfive_wdt_runtime_resume(struct device *dev)
>> +{
>> + struct starfive_wdt *wdt = dev_get_drvdata(dev);
>> + int ret;
>> +
>> + ret = clk_prepare_enable(wdt->apb_clk);
>> + if (ret) {
>> + dev_err(wdt->dev, "failed to enable apb_clk.\n");
>> + return ret;
>> + }
>> +
>> + ret = clk_prepare_enable(wdt->core_clk);
>> + if (ret)
>> + dev_err(wdt->dev, "failed to enable core_clk.\n");
>> +
>> + return ret;
>> +}
>> +#endif /* CONFIG_PM */
>> +
>> +static const struct dev_pm_ops starfive_wdt_pm_ops = {
>> + SET_RUNTIME_PM_OPS(starfive_wdt_runtime_suspend, starfive_wdt_runtime_resume, NULL)
>> + SET_SYSTEM_SLEEP_PM_OPS(starfive_wdt_suspend, starfive_wdt_resume)
>> +};
>> +
>> +static struct platform_driver starfive_wdt_driver = {
>> + .probe = starfive_wdt_probe,
>> + .remove = starfive_wdt_remove,
>> + .shutdown = starfive_wdt_shutdown,
>> + .id_table = starfive_wdt_ids,
>> + .driver = {
>> + .name = "starfive-wdt",
>> + .pm = &starfive_wdt_pm_ops,
>> + .of_match_table = of_match_ptr(starfive_wdt_match),
>> + },
>> +};
>> +
>> +module_platform_driver(starfive_wdt_driver);
>> +
>> +MODULE_AUTHOR("Xingyu Wu <xingyu.wu@starfivetech.com>");
>> +MODULE_AUTHOR("Samin Guo <samin.guo@starfivetech.com>");
>> +MODULE_DESCRIPTION("StarFive Watchdog Device Driver");
>> +MODULE_LICENSE("GPL v2");

Thank for your review, I will modify this according to your suggestions.

Best regards,
Xingyu Wu