Commit b4075ecf authored by Linus Walleij's avatar Linus Walleij Committed by Wim Van Sebroeck

watchdog: ixp4xx: Make sure restart always works

The IXP4xx watchdog in early "A0" silicon is unreliable and
cannot be registered, however for some systems such as the
USRobotics USR8200 the watchdog is the only restart option,
so implement a "dummy" watchdog that can only support restart
in this case.

Fixes: 1aea5228 ("watchdog: ixp4xx: Implement restart")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230926-ixp4xx-wdt-restart-v2-1-15cf4639b423@linaro.orgSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent e2c520c4
...@@ -105,6 +105,25 @@ static const struct watchdog_ops ixp4xx_wdt_ops = { ...@@ -105,6 +105,25 @@ static const struct watchdog_ops ixp4xx_wdt_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
/*
* The A0 version of the IXP422 had a bug in the watchdog making
* is useless, but we still need to use it to restart the system
* as it is the only way, so in this special case we register a
* "dummy" watchdog that doesn't really work, but will support
* the restart operation.
*/
static int ixp4xx_wdt_dummy(struct watchdog_device *wdd)
{
return 0;
}
static const struct watchdog_ops ixp4xx_wdt_restart_only_ops = {
.start = ixp4xx_wdt_dummy,
.stop = ixp4xx_wdt_dummy,
.restart = ixp4xx_wdt_restart,
.owner = THIS_MODULE,
};
static const struct watchdog_info ixp4xx_wdt_info = { static const struct watchdog_info ixp4xx_wdt_info = {
.options = WDIOF_KEEPALIVEPING .options = WDIOF_KEEPALIVEPING
| WDIOF_MAGICCLOSE | WDIOF_MAGICCLOSE
...@@ -114,14 +133,17 @@ static const struct watchdog_info ixp4xx_wdt_info = { ...@@ -114,14 +133,17 @@ static const struct watchdog_info ixp4xx_wdt_info = {
static int ixp4xx_wdt_probe(struct platform_device *pdev) static int ixp4xx_wdt_probe(struct platform_device *pdev)
{ {
static const struct watchdog_ops *iwdt_ops;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ixp4xx_wdt *iwdt; struct ixp4xx_wdt *iwdt;
struct clk *clk; struct clk *clk;
int ret; int ret;
if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) { if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) {
dev_err(dev, "Rev. A0 IXP42x CPU detected - watchdog disabled\n"); dev_info(dev, "Rev. A0 IXP42x CPU detected - only restart supported\n");
return -ENODEV; iwdt_ops = &ixp4xx_wdt_restart_only_ops;
} else {
iwdt_ops = &ixp4xx_wdt_ops;
} }
iwdt = devm_kzalloc(dev, sizeof(*iwdt), GFP_KERNEL); iwdt = devm_kzalloc(dev, sizeof(*iwdt), GFP_KERNEL);
...@@ -141,7 +163,7 @@ static int ixp4xx_wdt_probe(struct platform_device *pdev) ...@@ -141,7 +163,7 @@ static int ixp4xx_wdt_probe(struct platform_device *pdev)
iwdt->rate = IXP4XX_TIMER_FREQ; iwdt->rate = IXP4XX_TIMER_FREQ;
iwdt->wdd.info = &ixp4xx_wdt_info; iwdt->wdd.info = &ixp4xx_wdt_info;
iwdt->wdd.ops = &ixp4xx_wdt_ops; iwdt->wdd.ops = iwdt_ops;
iwdt->wdd.min_timeout = 1; iwdt->wdd.min_timeout = 1;
iwdt->wdd.max_timeout = U32_MAX / iwdt->rate; iwdt->wdd.max_timeout = U32_MAX / iwdt->rate;
iwdt->wdd.parent = dev; iwdt->wdd.parent = dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment