qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 02:48:26 +02:00
Code

ramips: watchdog: use maximum possible timeout by default

Browse Source 
As the userspace has no means to determine the maximum possible timeout, use
that as the default and let the userspace lower it when necessary.

As the result the usual OpenWrt install (with busybox's watchdog trying to set
the timeout to 60s on start) is using a 33s timeout on an RT3052 clocked at
384MHz instead of the current 20s default.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33144 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2012-08-12 12:48:28 +00:00
parent 3ccfe576de
commit 2c5c4009fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/ramips/files/drivers/watchdog/ramips_wdt.c
View File

@ -33,7 +33,7 @@
#define DRIVER_NAME "ramips-wdt" #define DRIVER_NAME "ramips-wdt"
#define RAMIPS_WDT_TIMEOUT 20 /* seconds */ #define RAMIPS_WDT_TIMEOUT 0 /* seconds */
#define RAMIPS_WDT_PRESCALE 65536 #define RAMIPS_WDT_PRESCALE 65536
#define TIMER_REG_TMRSTAT 0x00 #define TIMER_REG_TMRSTAT 0x00
@ -59,7 +59,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
static int ramips_wdt_timeout = RAMIPS_WDT_TIMEOUT; static int ramips_wdt_timeout = RAMIPS_WDT_TIMEOUT;
module_param_named(timeout, ramips_wdt_timeout, int, 0); module_param_named(timeout, ramips_wdt_timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds " MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, 0 means use maximum "
"(default=" __MODULE_STRING(RAMIPS_WDT_TIMEOUT) "s)"); "(default=" __MODULE_STRING(RAMIPS_WDT_TIMEOUT) "s)");
static unsigned long ramips_wdt_flags; static unsigned long ramips_wdt_flags;
@ -112,9 +112,9 @@ static inline void ramips_wdt_disable(void)
static int ramips_wdt_set_timeout(int val) static int ramips_wdt_set_timeout(int val)
{ {
if (val < 1 || val > ramips_wdt_max_timeout) { if (val < 1 || val > ramips_wdt_max_timeout) {
pr_crit(DRIVER_NAME pr_warn(DRIVER_NAME
": timeout value %d must be 0 < timeout < %d\n", ": timeout value %d must be 0 < timeout <= %d, using %d\n",
val, ramips_wdt_max_timeout); val, ramips_wdt_max_timeout, ramips_wdt_timeout);
return -EINVAL; return -EINVAL;
} }
@ -291,7 +291,7 @@ static int __devinit ramips_wdt_probe(struct platform_device *pdev)
ramips_wdt_timeout > ramips_wdt_max_timeout) { ramips_wdt_timeout > ramips_wdt_max_timeout) {
ramips_wdt_timeout = ramips_wdt_max_timeout; ramips_wdt_timeout = ramips_wdt_max_timeout;
dev_info(&pdev->dev, dev_info(&pdev->dev,
"timeout value must be 0 < timeout < %d, using %d\n", "timeout value must be 0 < timeout <= %d, using %d\n",
ramips_wdt_max_timeout, ramips_wdt_timeout); ramips_wdt_max_timeout, ramips_wdt_timeout);
} }