Skip to content

L
linux-davinci
Commit cd3c1cde authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] orion5x_wdt.c: 'ORION5X_TCLK' undeclared
  [WATCHDOG] gef_wdt.c: fsl_get_sys_freq() failure not noticed
  [WATCHDOG] ks8695_wdt.c: 'CLOCK_TICK_RATE' undeclared
  [WATCHDOG] rc32434_wdt: fix sections
  [WATCHDOG] rc32434_wdt: fix watchdog driver
parents 5b61f6ac c9a0c8a6
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 100 deletions
drivers/watchdog/gef_wdt.c
View file @ cd3c1cde
...@@ -269,7 +269,7 @@ static int __devinit gef_wdt_probe(struct of_device *dev, ...@@ -269,7 +269,7 @@ static int __devinit gef_wdt_probe(struct of_device *dev,
bus_clk = 133; /* in MHz */ bus_clk = 133; /* in MHz */
freq = fsl_get_sys_freq(); freq = fsl_get_sys_freq();
if (freq > 0) if (freq != -1)
bus_clk = freq; bus_clk = freq;
/* Map devices registers into memory */ /* Map devices registers into memory */
......
drivers/watchdog/ks8695_wdt.c
View file @ cd3c1cde
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <mach/timex.h>
#include <mach/regs-timer.h> #include <mach/regs-timer.h>
#define WDT_DEFAULT_TIME 5 /* seconds */ #define WDT_DEFAULT_TIME 5 /* seconds */
......
drivers/watchdog/orion5x_wdt.c
View file @ cd3c1cde
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#define WDT_EN 0x0010 #define WDT_EN 0x0010
#define WDT_VAL (TIMER_VIRT_BASE + 0x0024) #define WDT_VAL (TIMER_VIRT_BASE + 0x0024)
#define ORION5X_TCLK 166666667
#define WDT_MAX_DURATION (0xffffffff / ORION5X_TCLK) #define WDT_MAX_DURATION (0xffffffff / ORION5X_TCLK)
#define WDT_IN_USE 0 #define WDT_IN_USE 0
#define WDT_OK_TO_CLOSE 1 #define WDT_OK_TO_CLOSE 1
......
drivers/watchdog/rc32434_wdt.c
View file @ cd3c1cde
...@@ -34,104 +34,89 @@ ...@@ -34,104 +34,89 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/mach-rc32434/integ.h> #include <asm/mach-rc32434/integ.h>
#define MAX_TIMEOUT 20 #define VERSION "0.4"
#define RC32434_WDT_INTERVAL (15 * HZ)
#define VERSION "0.2"
static struct { static struct {
struct completion stop;
int running;
struct timer_list timer;
int queue;
int default_ticks;
unsigned long inuse; unsigned long inuse;
} rc32434_wdt_device; } rc32434_wdt_device;
static struct integ __iomem *wdt_reg; static struct integ __iomem *wdt_reg;
static int ticks = 100 * HZ;
static int expect_close; static int expect_close;
static int timeout;
/* Board internal clock speed in Hz,
* the watchdog timer ticks at. */
extern unsigned int idt_cpu_freq;
/* translate wtcompare value to seconds and vice versa */
#define WTCOMP2SEC(x) (x / idt_cpu_freq)
#define SEC2WTCOMP(x) (x * idt_cpu_freq)
/* Use a default timeout of 20s. This should be
* safe for CPU clock speeds up to 400MHz, as
* ((2 ^ 32) - 1) / (400MHz / 2) = 21s. */
#define WATCHDOG_TIMEOUT 20
static int timeout = WATCHDOG_TIMEOUT;
static int nowayout = WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
/* apply or and nand masks to data read from addr and write back */
#define SET_BITS(addr, or, nand) \
writel((readl(&addr) | or) & ~nand, &addr)
static void rc32434_wdt_start(void) static void rc32434_wdt_start(void)
{ {
u32 val; u32 or, nand;
if (!rc32434_wdt_device.inuse) {
writel(0, &wdt_reg->wtcount);
val = RC32434_ERR_WRE; /* zero the counter before enabling */
writel(readl(&wdt_reg->errcs) | val, &wdt_reg->errcs); writel(0, &wdt_reg->wtcount);
val = RC32434_WTC_EN; /* don't generate a non-maskable interrupt,
writel(readl(&wdt_reg->wtc) | val, &wdt_reg->wtc); * do a warm reset instead */
} nand = 1 << RC32434_ERR_WNE;
rc32434_wdt_device.running++; or = 1 << RC32434_ERR_WRE;
}
static void rc32434_wdt_stop(void) /* reset the ERRCS timeout bit in case it's set */
{ nand |= 1 << RC32434_ERR_WTO;
u32 val;
if (rc32434_wdt_device.running) { SET_BITS(wdt_reg->errcs, or, nand);
val = ~RC32434_WTC_EN; /* reset WTC timeout bit and enable WDT */
writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc); nand = 1 << RC32434_WTC_TO;
or = 1 << RC32434_WTC_EN;
val = ~RC32434_ERR_WRE; SET_BITS(wdt_reg->wtc, or, nand);
writel(readl(&wdt_reg->errcs) & val, &wdt_reg->errcs); }
rc32434_wdt_device.running = 0; static void rc32434_wdt_stop(void)
} {
/* Disable WDT */
SET_BITS(wdt_reg->wtc, 0, 1 << RC32434_WTC_EN);
} }
static void rc32434_wdt_set(int new_timeout) static int rc32434_wdt_set(int new_timeout)
{ {
u32 cmp = new_timeout * HZ; int max_to = WTCOMP2SEC((u32)-1);
u32 state, val;
if (new_timeout < 0 || new_timeout > max_to) {
printk(KERN_ERR KBUILD_MODNAME
": timeout value must be between 0 and %d",
max_to);
return -EINVAL;
}
timeout = new_timeout; timeout = new_timeout;
/* writel(SEC2WTCOMP(timeout), &wdt_reg->wtcompare);
* store and disable WTC
*/
state = (u32)(readl(&wdt_reg->wtc) & RC32434_WTC_EN);
val = ~RC32434_WTC_EN;
writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc);
writel(0, &wdt_reg->wtcount);
writel(cmp, &wdt_reg->wtcompare);
/*
* restore WTC
*/
writel(readl(&wdt_reg->wtc) | state, &wdt_reg);
}
static void rc32434_wdt_reset(void) return 0;
{
ticks = rc32434_wdt_device.default_ticks;
} }
static void rc32434_wdt_update(unsigned long unused) static void rc32434_wdt_ping(void)
{ {
if (rc32434_wdt_device.running)
ticks--;
writel(0, &wdt_reg->wtcount); writel(0, &wdt_reg->wtcount);
if (rc32434_wdt_device.queue && ticks)
mod_timer(&rc32434_wdt_device.timer,
jiffies + RC32434_WDT_INTERVAL);
else
complete(&rc32434_wdt_device.stop);
} }
static int rc32434_wdt_open(struct inode *inode, struct file *file) static int rc32434_wdt_open(struct inode *inode, struct file *file)
...@@ -142,19 +127,23 @@ static int rc32434_wdt_open(struct inode *inode, struct file *file) ...@@ -142,19 +127,23 @@ static int rc32434_wdt_open(struct inode *inode, struct file *file)
if (nowayout) if (nowayout)
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
rc32434_wdt_start();
rc32434_wdt_ping();
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
static int rc32434_wdt_release(struct inode *inode, struct file *file) static int rc32434_wdt_release(struct inode *inode, struct file *file)
{ {
if (expect_close && nowayout == 0) { if (expect_close == 42) {
rc32434_wdt_stop(); rc32434_wdt_stop();
printk(KERN_INFO KBUILD_MODNAME ": disabling watchdog timer\n"); printk(KERN_INFO KBUILD_MODNAME ": disabling watchdog timer\n");
module_put(THIS_MODULE); module_put(THIS_MODULE);
} else } else {
printk(KERN_CRIT KBUILD_MODNAME printk(KERN_CRIT KBUILD_MODNAME
": device closed unexpectedly. WDT will not stop !\n"); ": device closed unexpectedly. WDT will not stop !\n");
rc32434_wdt_ping();
}
clear_bit(0, &rc32434_wdt_device.inuse); clear_bit(0, &rc32434_wdt_device.inuse);
return 0; return 0;
} }
...@@ -174,10 +163,10 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data, ...@@ -174,10 +163,10 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data,
if (get_user(c, data + i)) if (get_user(c, data + i))
return -EFAULT; return -EFAULT;
if (c == 'V') if (c == 'V')
expect_close = 1; expect_close = 42;
} }
} }
rc32434_wdt_update(0); rc32434_wdt_ping();
return len; return len;
} }
return 0; return 0;
...@@ -197,11 +186,11 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -197,11 +186,11 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
}; };
switch (cmd) { switch (cmd) {
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:
rc32434_wdt_reset(); rc32434_wdt_ping();
break; break;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
value = readl(&wdt_reg->wtcount); value = 0;
if (copy_to_user(argp, &value, sizeof(int))) if (copy_to_user(argp, &value, sizeof(int)))
return -EFAULT; return -EFAULT;
break; break;
...@@ -218,6 +207,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -218,6 +207,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
break; break;
case WDIOS_DISABLECARD: case WDIOS_DISABLECARD:
rc32434_wdt_stop(); rc32434_wdt_stop();
break;
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -225,11 +215,9 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -225,11 +215,9 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
if (copy_from_user(&new_timeout, argp, sizeof(int))) if (copy_from_user(&new_timeout, argp, sizeof(int)))
return -EFAULT; return -EFAULT;
if (new_timeout < 1) if (rc32434_wdt_set(new_timeout))
return -EINVAL; return -EINVAL;
if (new_timeout > MAX_TIMEOUT) /* Fall through */
return -EINVAL;
rc32434_wdt_set(new_timeout);
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
return copy_to_user(argp, &timeout, sizeof(int)); return copy_to_user(argp, &timeout, sizeof(int));
default: default:
...@@ -254,15 +242,15 @@ static struct miscdevice rc32434_wdt_miscdev = { ...@@ -254,15 +242,15 @@ static struct miscdevice rc32434_wdt_miscdev = {
.fops = &rc32434_wdt_fops, .fops = &rc32434_wdt_fops,
}; };
static char banner[] = KERN_INFO KBUILD_MODNAME static char banner[] __devinitdata = KERN_INFO KBUILD_MODNAME
": Watchdog Timer version " VERSION ", timer margin: %d sec\n"; ": Watchdog Timer version " VERSION ", timer margin: %d sec\n";
static int rc32434_wdt_probe(struct platform_device *pdev) static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct resource *r; struct resource *r;
r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb500_wdt_res"); r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb532_wdt_res");
if (!r) { if (!r) {
printk(KERN_ERR KBUILD_MODNAME printk(KERN_ERR KBUILD_MODNAME
"failed to retrieve resources\n"); "failed to retrieve resources\n");
...@@ -277,24 +265,12 @@ static int rc32434_wdt_probe(struct platform_device *pdev) ...@@ -277,24 +265,12 @@ static int rc32434_wdt_probe(struct platform_device *pdev)
} }
ret = misc_register(&rc32434_wdt_miscdev); ret = misc_register(&rc32434_wdt_miscdev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR KBUILD_MODNAME printk(KERN_ERR KBUILD_MODNAME
"failed to register watchdog device\n"); "failed to register watchdog device\n");
goto unmap; goto unmap;
} }
init_completion(&rc32434_wdt_device.stop);
rc32434_wdt_device.queue = 0;
clear_bit(0, &rc32434_wdt_device.inuse);
setup_timer(&rc32434_wdt_device.timer, rc32434_wdt_update, 0L);
rc32434_wdt_device.default_ticks = ticks;
rc32434_wdt_start();
printk(banner, timeout); printk(banner, timeout);
return 0; return 0;
...@@ -304,23 +280,17 @@ unmap: ...@@ -304,23 +280,17 @@ unmap:
return ret; return ret;
} }
static int rc32434_wdt_remove(struct platform_device *pdev) static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
{ {
if (rc32434_wdt_device.queue) {
rc32434_wdt_device.queue = 0;
wait_for_completion(&rc32434_wdt_device.stop);
}
misc_deregister(&rc32434_wdt_miscdev); misc_deregister(&rc32434_wdt_miscdev);
iounmap(wdt_reg); iounmap(wdt_reg);
return 0; return 0;
} }
static struct platform_driver rc32434_wdt = { static struct platform_driver rc32434_wdt = {
.probe = rc32434_wdt_probe, .probe = rc32434_wdt_probe,
.remove = rc32434_wdt_remove, .remove = __devexit_p(rc32434_wdt_remove),
.driver = { .driver = {
.name = "rc32434_wdt", .name = "rc32434_wdt",
} }
}; };
......
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