Skip to content

L
linux
Commit 8690d8a9 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] i6300esb.c: start locking
  [WATCHDOG] i6300esb.c: convert to platform device driver
  [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
  [WATCHDOG] Fix io.h & uaccess.h includes.
  [WATCHDOG] More coding-style and trivial clean-up
  [WATCHDOG] struct file_operations should be const
  [WATCHDOG] cpwd.c: Coding style - Clean-up
  [WATCHDOG] hpwdt.c: Add new HP BMC controller. 
  [PATCH 13/13] drivers/watchdog: use USB API functions rather than constants
  [WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data
  [WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup
  [WATCHDOG] rc32434_wdt: add spin_locking
  [WATCHDOG] rc32434_wdt: add shutdown method
  [WATCHDOG] rc32434_wdt: add timeout module parameter
  [WATCHDOG] rc32434_wdt: clean-up driver
  [WATCHDOG] davinci: convert to ioremap() + io[read|write]
  [WATCHDOG] w83697ug: add error checking
  [WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl
parents d3f12d36 3b9d49ee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 793 additions and 536 deletions
arch/arm/mach-orion5x/common.c
View file @ 8690d8a9
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <plat/ehci-orion.h> #include <plat/ehci-orion.h>
#include <plat/mv_xor.h> #include <plat/mv_xor.h>
#include <plat/orion_nand.h> #include <plat/orion_nand.h>
#include <plat/orion5x_wdt.h>
#include <plat/time.h> #include <plat/time.h>
#include "common.h" #include "common.h"
...@@ -532,6 +533,29 @@ void __init orion5x_xor_init(void) ...@@ -532,6 +533,29 @@ void __init orion5x_xor_init(void)
} }
/*****************************************************************************
* Watchdog
****************************************************************************/
static struct orion5x_wdt_platform_data orion5x_wdt_data = {
.tclk = 0,
};
static struct platform_device orion5x_wdt_device = {
.name = "orion5x_wdt",
.id = -1,
.dev = {
.platform_data = &orion5x_wdt_data,
},
.num_resources = 0,
};
void __init orion5x_wdt_init(void)
{
orion5x_wdt_data.tclk = orion5x_tclk;
platform_device_register(&orion5x_wdt_device);
}
/***************************************************************************** /*****************************************************************************
* Time handling * Time handling
****************************************************************************/ ****************************************************************************/
...@@ -631,6 +655,11 @@ void __init orion5x_init(void) ...@@ -631,6 +655,11 @@ void __init orion5x_init(void)
printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n"); printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
disable_hlt(); disable_hlt();
} }
/*
* Register watchdog driver
*/
orion5x_wdt_init();
} }
/* /*
......
arch/arm/plat-orion/include/plat/orion5x_wdt.h 0 → 100644
View file @ 8690d8a9
/*
* arch/arm/plat-orion/include/plat/orion5x_wdt.h
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#ifndef __PLAT_ORION5X_WDT_H
#define __PLAT_ORION5X_WDT_H
struct orion5x_wdt_platform_data {
u32 tclk; /* no <linux/clk.h> support yet */
};
#endif
drivers/watchdog/Kconfig
View file @ 8690d8a9
...@@ -940,21 +940,6 @@ config WDT ...@@ -940,21 +940,6 @@ config WDT
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called wdt. module will be called wdt.
config WDT_501
bool "WDT501 features"
depends on WDT
help
Saying Y here and creating a character special file /dev/temperature
with major number 10 and minor number 131 ("man mknod") will give
you a thermometer inside your computer: reading from
/dev/temperature yields one byte, the temperature in degrees
Fahrenheit. This works only if you have a WDT501P watchdog board
installed.
If you want to enable the Fan Tachometer on the WDT501P, then you
can do this via the tachometer parameter. Only do this if you have a
fan tachometer actually set up.
# #
# PCI-based Watchdog Cards # PCI-based Watchdog Cards
# #
......
drivers/watchdog/acquirewdt.c
View file @ 8690d8a9
/* /*
* Acquire Single Board Computer Watchdog Timer driver * Acquire Single Board Computer Watchdog Timer driver
* *
* Based on wdt.c. Original copyright messages: * Based on wdt.c. Original copyright messages:
* *
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
* All Rights Reserved. * All Rights Reserved.
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* *
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk> * (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
* *
* 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
* Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
* Can't add timeout - driver doesn't allow changing value * Can't add timeout - driver doesn't allow changing value
*/ */
/* /*
......
drivers/watchdog/advantechwdt.c
View file @ 8690d8a9
...@@ -138,7 +138,9 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -138,7 +138,9 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
int __user *p = argp; int __user *p = argp;
static struct watchdog_info ident = { static struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, .options = WDIOF_KEEPALIVEPING |
WDIOF_SETTIMEOUT |
WDIOF_MAGICCLOSE,
.firmware_version = 1, .firmware_version = 1,
.identity = WATCHDOG_NAME, .identity = WATCHDOG_NAME,
}; };
...@@ -259,7 +261,8 @@ static int __devinit advwdt_probe(struct platform_device *dev) ...@@ -259,7 +261,8 @@ static int __devinit advwdt_probe(struct platform_device *dev)
goto unreg_stop; goto unreg_stop;
} }
/* Check that the heartbeat value is within it's range ; if not reset to the default */ /* Check that the heartbeat value is within it's range ;
* if not reset to the default */
if (advwdt_set_heartbeat(timeout)) { if (advwdt_set_heartbeat(timeout)) {
advwdt_set_heartbeat(WATCHDOG_TIMEOUT); advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
printk(KERN_INFO PFX printk(KERN_INFO PFX
......
drivers/watchdog/alim1535_wdt.c
View file @ 8690d8a9
...@@ -60,7 +60,7 @@ static void ali_start(void) ...@@ -60,7 +60,7 @@ static void ali_start(void)
pci_read_config_dword(ali_pci, 0xCC, &val); pci_read_config_dword(ali_pci, 0xCC, &val);
val &= ~0x3F; /* Mask count */ val &= ~0x3F; /* Mask count */
val |= (1<<25) | ali_timeout_bits; val |= (1 << 25) | ali_timeout_bits;
pci_write_config_dword(ali_pci, 0xCC, val); pci_write_config_dword(ali_pci, 0xCC, val);
spin_unlock(&ali_lock); spin_unlock(&ali_lock);
...@@ -79,8 +79,8 @@ static void ali_stop(void) ...@@ -79,8 +79,8 @@ static void ali_stop(void)
spin_lock(&ali_lock); spin_lock(&ali_lock);
pci_read_config_dword(ali_pci, 0xCC, &val); pci_read_config_dword(ali_pci, 0xCC, &val);
val &= ~0x3F; /* Mask count to zero (disabled) */ val &= ~0x3F; /* Mask count to zero (disabled) */
val &= ~(1<<25);/* and for safety mask the reset enable */ val &= ~(1 << 25); /* and for safety mask the reset enable */
pci_write_config_dword(ali_pci, 0xCC, val); pci_write_config_dword(ali_pci, 0xCC, val);
spin_unlock(&ali_lock); spin_unlock(&ali_lock);
...@@ -89,7 +89,7 @@ static void ali_stop(void) ...@@ -89,7 +89,7 @@ static void ali_stop(void)
/* /*
* ali_keepalive - send a keepalive to the watchdog * ali_keepalive - send a keepalive to the watchdog
* *
* Send a keepalive to the timer (actually we restart the timer). * Send a keepalive to the timer (actually we restart the timer).
*/ */
static void ali_keepalive(void) static void ali_keepalive(void)
...@@ -109,11 +109,11 @@ static int ali_settimer(int t) ...@@ -109,11 +109,11 @@ static int ali_settimer(int t)
if (t < 0) if (t < 0)
return -EINVAL; return -EINVAL;
else if (t < 60) else if (t < 60)
ali_timeout_bits = t|(1<<6); ali_timeout_bits = t|(1 << 6);
else if (t < 3600) else if (t < 3600)
ali_timeout_bits = (t/60)|(1<<7); ali_timeout_bits = (t / 60)|(1 << 7);
else if (t < 18000) else if (t < 18000)
ali_timeout_bits = (t/300)|(1<<6)|(1<<7); ali_timeout_bits = (t / 300)|(1 << 6)|(1 << 7);
else else
return -EINVAL; return -EINVAL;
...@@ -138,7 +138,7 @@ static int ali_settimer(int t) ...@@ -138,7 +138,7 @@ static int ali_settimer(int t)
*/ */
static ssize_t ali_write(struct file *file, const char __user *data, static ssize_t ali_write(struct file *file, const char __user *data,
size_t len, loff_t *ppos) size_t len, loff_t *ppos)
{ {
/* See if we got the magic character 'V' and reload the timer */ /* See if we got the magic character 'V' and reload the timer */
if (len) { if (len) {
...@@ -348,9 +348,9 @@ static int __init ali_find_watchdog(void) ...@@ -348,9 +348,9 @@ static int __init ali_find_watchdog(void)
/* Timer bits */ /* Timer bits */
wdog &= ~0x3F; wdog &= ~0x3F;
/* Issued events */ /* Issued events */
wdog &= ~((1<<27)|(1<<26)|(1<<25)|(1<<24)); wdog &= ~((1 << 27)|(1 << 26)|(1 << 25)|(1 << 24));
/* No monitor bits */ /* No monitor bits */
wdog &= ~((1<<16)|(1<<13)|(1<<12)|(1<<11)|(1<<10)|(1<<9)); wdog &= ~((1 << 16)|(1 << 13)|(1 << 12)|(1 << 11)|(1 << 10)|(1 << 9));
pci_write_config_dword(pdev, 0xCC, wdog); pci_write_config_dword(pdev, 0xCC, wdog);
......
drivers/watchdog/alim7101_wdt.c
View file @ 8690d8a9
...@@ -355,7 +355,8 @@ static int __init alim7101_wdt_init(void) ...@@ -355,7 +355,8 @@ static int __init alim7101_wdt_init(void)
alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
NULL); NULL);
if (!alim7101_pmu) { if (!alim7101_pmu) {
printk(KERN_INFO PFX "ALi M7101 PMU not present - WDT not set\n"); printk(KERN_INFO PFX
"ALi M7101 PMU not present - WDT not set\n");
return -EBUSY; return -EBUSY;
} }
...@@ -399,7 +400,8 @@ static int __init alim7101_wdt_init(void) ...@@ -399,7 +400,8 @@ static int __init alim7101_wdt_init(void)
rc = misc_register(&wdt_miscdev); rc = misc_register(&wdt_miscdev);
if (rc) { if (rc) {
printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", printk(KERN_ERR PFX
"cannot register miscdev on minor=%d (err=%d)\n",
wdt_miscdev.minor, rc); wdt_miscdev.minor, rc);
goto err_out_reboot; goto err_out_reboot;
} }
......
drivers/watchdog/at91sam9_wdt.c
View file @ 8690d8a9
...@@ -201,7 +201,7 @@ static long at91_wdt_ioctl(struct file *file, ...@@ -201,7 +201,7 @@ static long at91_wdt_ioctl(struct file *file,
* Pat the watchdog whenever device is written to. * Pat the watchdog whenever device is written to.
*/ */
static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len, static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len,
loff_t *ppos) loff_t *ppos)
{ {
if (!len) if (!len)
return 0; return 0;
......
drivers/watchdog/cpwd.c
View file @ 8690d8a9
/* cpwd.c - driver implementation for hardware watchdog /* cpwd.c - driver implementation for hardware watchdog
* timers found on Sun Microsystems CP1400 and CP1500 boards. * timers found on Sun Microsystems CP1400 and CP1500 boards.
* *
* This device supports both the generic Linux watchdog * This device supports both the generic Linux watchdog
* interface and Solaris-compatible ioctls as best it is * interface and Solaris-compatible ioctls as best it is
* able. * able.
* *
* NOTE: CP1400 systems appear to have a defective intr_mask * NOTE: CP1400 systems appear to have a defective intr_mask
* register on the PLD, preventing the disabling of * register on the PLD, preventing the disabling of
* timer interrupts. We use a timer to periodically * timer interrupts. We use a timer to periodically
* reset 'stopped' watchdogs on affected platforms. * reset 'stopped' watchdogs on affected platforms.
* *
* Copyright (c) 2000 Eric Brower (ebrower@usa.net) * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
...@@ -28,10 +28,9 @@ ...@@ -28,10 +28,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/uaccess.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/watchdog.h> #include <asm/watchdog.h>
#define DRIVER_NAME "cpwd" #define DRIVER_NAME "cpwd"
...@@ -43,8 +42,8 @@ ...@@ -43,8 +42,8 @@
#define WD_BLIMIT 0xFFFF #define WD_BLIMIT 0xFFFF
#define WD0_MINOR 212 #define WD0_MINOR 212
#define WD1_MINOR 213 #define WD1_MINOR 213
#define WD2_MINOR 214 #define WD2_MINOR 214
/* Internal driver definitions. */ /* Internal driver definitions. */
#define WD0_ID 0 #define WD0_ID 0
...@@ -91,16 +90,16 @@ struct cpwd { ...@@ -91,16 +90,16 @@ struct cpwd {
static struct cpwd *cpwd_device; static struct cpwd *cpwd_device;
/* Sun uses Altera PLD EPF8820ATC144-4 /* Sun uses Altera PLD EPF8820ATC144-4
* providing three hardware watchdogs: * providing three hardware watchdogs:
* *
* 1) RIC - sends an interrupt when triggered * 1) RIC - sends an interrupt when triggered
* 2) XIR - asserts XIR_B_RESET when triggered, resets CPU * 2) XIR - asserts XIR_B_RESET when triggered, resets CPU
* 3) POR - asserts POR_B_RESET when triggered, resets CPU, backplane, board * 3) POR - asserts POR_B_RESET when triggered, resets CPU, backplane, board
* *
*** Timer register block definition (struct wd_timer_regblk) *** Timer register block definition (struct wd_timer_regblk)
* *
* dcntr and limit registers (halfword access): * dcntr and limit registers (halfword access):
* ------------------- * -------------------
* | 15 | ...| 1 | 0 | * | 15 | ...| 1 | 0 |
* ------------------- * -------------------
...@@ -108,7 +107,8 @@ static struct cpwd *cpwd_device; ...@@ -108,7 +107,8 @@ static struct cpwd *cpwd_device;
* ------------------- * -------------------
* dcntr - Current 16-bit downcounter value. * dcntr - Current 16-bit downcounter value.
* When downcounter reaches '0' watchdog expires. * When downcounter reaches '0' watchdog expires.
* Reading this register resets downcounter with 'limit' value. * Reading this register resets downcounter with
* 'limit' value.
* limit - 16-bit countdown value in 1/10th second increments. * limit - 16-bit countdown value in 1/10th second increments.
* Writing this register begins countdown with input value. * Writing this register begins countdown with input value.
* Reading from this register does not affect counter. * Reading from this register does not affect counter.
...@@ -158,11 +158,11 @@ static int wd0_timeout = 0; ...@@ -158,11 +158,11 @@ static int wd0_timeout = 0;
static int wd1_timeout = 0; static int wd1_timeout = 0;
static int wd2_timeout = 0; static int wd2_timeout = 0;
module_param (wd0_timeout, int, 0); module_param(wd0_timeout, int, 0);
MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs"); MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");
module_param (wd1_timeout, int, 0); module_param(wd1_timeout, int, 0);
MODULE_PARM_DESC(wd1_timeout, "Default watchdog1 timeout in 1/10secs"); MODULE_PARM_DESC(wd1_timeout, "Default watchdog1 timeout in 1/10secs");
module_param (wd2_timeout, int, 0); module_param(wd2_timeout, int, 0);
MODULE_PARM_DESC(wd2_timeout, "Default watchdog2 timeout in 1/10secs"); MODULE_PARM_DESC(wd2_timeout, "Default watchdog2 timeout in 1/10secs");
MODULE_AUTHOR("Eric Brower <ebrower@usa.net>"); MODULE_AUTHOR("Eric Brower <ebrower@usa.net>");
...@@ -201,9 +201,9 @@ static u8 cpwd_readb(void __iomem *addr) ...@@ -201,9 +201,9 @@ static u8 cpwd_readb(void __iomem *addr)
static void cpwd_toggleintr(struct cpwd *p, int index, int enable) static void cpwd_toggleintr(struct cpwd *p, int index, int enable)
{ {
unsigned char curregs = cpwd_readb(p->regs + PLD_IMASK); unsigned char curregs = cpwd_readb(p->regs + PLD_IMASK);
unsigned char setregs = unsigned char setregs =
(index == -1) ? (index == -1) ?
(WD0_INTR_MASK | WD1_INTR_MASK | WD2_INTR_MASK) : (WD0_INTR_MASK | WD1_INTR_MASK | WD2_INTR_MASK) :
(p->devs[index].intr_mask); (p->devs[index].intr_mask);
if (enable == WD_INTR_ON) if (enable == WD_INTR_ON)
...@@ -303,24 +303,24 @@ static int cpwd_getstatus(struct cpwd *p, int index) ...@@ -303,24 +303,24 @@ static int cpwd_getstatus(struct cpwd *p, int index)
unsigned char ret = WD_STOPPED; unsigned char ret = WD_STOPPED;
/* determine STOPPED */ /* determine STOPPED */
if (!stat) if (!stat)
return ret; return ret;
/* determine EXPIRED vs FREERUN vs RUNNING */ /* determine EXPIRED vs FREERUN vs RUNNING */
else if (WD_S_EXPIRED & stat) { else if (WD_S_EXPIRED & stat) {
ret = WD_EXPIRED; ret = WD_EXPIRED;
} else if(WD_S_RUNNING & stat) { } else if (WD_S_RUNNING & stat) {
if (intr & p->devs[index].intr_mask) { if (intr & p->devs[index].intr_mask) {
ret = WD_FREERUN; ret = WD_FREERUN;
} else { } else {
/* Fudge WD_EXPIRED status for defective CP1400-- /* Fudge WD_EXPIRED status for defective CP1400--
* IF timer is running * IF timer is running
* AND brokenstop is set * AND brokenstop is set
* AND an interrupt has been serviced * AND an interrupt has been serviced
* we are WD_EXPIRED. * we are WD_EXPIRED.
* *
* IF timer is running * IF timer is running
* AND brokenstop is set * AND brokenstop is set
* AND no interrupt has been serviced * AND no interrupt has been serviced
* we are WD_FREERUN. * we are WD_FREERUN.
*/ */
...@@ -329,7 +329,8 @@ static int cpwd_getstatus(struct cpwd *p, int index) ...@@ -329,7 +329,8 @@ static int cpwd_getstatus(struct cpwd *p, int index)
if (p->devs[index].runstatus & WD_STAT_SVCD) { if (p->devs[index].runstatus & WD_STAT_SVCD) {
ret = WD_EXPIRED; ret = WD_EXPIRED;
} else { } else {
/* we could as well pretend we are expired */ /* we could as well pretend
* we are expired */
ret = WD_FREERUN; ret = WD_FREERUN;
} }
} else { } else {
...@@ -342,7 +343,7 @@ static int cpwd_getstatus(struct cpwd *p, int index) ...@@ -342,7 +343,7 @@ static int cpwd_getstatus(struct cpwd *p, int index)
if (p->devs[index].runstatus & WD_STAT_SVCD) if (p->devs[index].runstatus & WD_STAT_SVCD)
ret |= WD_SERVICED; ret |= WD_SERVICED;
return(ret); return ret;
} }
static irqreturn_t cpwd_interrupt(int irq, void *dev_id) static irqreturn_t cpwd_interrupt(int irq, void *dev_id)
...@@ -367,22 +368,22 @@ static int cpwd_open(struct inode *inode, struct file *f) ...@@ -367,22 +368,22 @@ static int cpwd_open(struct inode *inode, struct file *f)
struct cpwd *p = cpwd_device; struct cpwd *p = cpwd_device;
lock_kernel(); lock_kernel();
switch(iminor(inode)) { switch (iminor(inode)) {
case WD0_MINOR: case WD0_MINOR:
case WD1_MINOR: case WD1_MINOR:
case WD2_MINOR: case WD2_MINOR:
break; break;
default: default:
unlock_kernel(); unlock_kernel();
return -ENODEV; return -ENODEV;
} }
/* Register IRQ on first open of device */ /* Register IRQ on first open of device */
if (!p->initialized) { if (!p->initialized) {
if (request_irq(p->irq, &cpwd_interrupt, if (request_irq(p->irq, &cpwd_interrupt,
IRQF_SHARED, DRIVER_NAME, p)) { IRQF_SHARED, DRIVER_NAME, p)) {
printk(KERN_ERR PFX "Cannot register IRQ %d\n", printk(KERN_ERR PFX "Cannot register IRQ %d\n",
p->irq); p->irq);
unlock_kernel(); unlock_kernel();
return -EBUSY; return -EBUSY;
...@@ -400,8 +401,7 @@ static int cpwd_release(struct inode *inode, struct file *file) ...@@ -400,8 +401,7 @@ static int cpwd_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static int cpwd_ioctl(struct inode *inode, struct file *file, static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
static struct watchdog_info info = { static struct watchdog_info info = {
.options = WDIOF_SETTIMEOUT, .options = WDIOF_SETTIMEOUT,
...@@ -409,6 +409,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file, ...@@ -409,6 +409,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file,
.identity = DRIVER_NAME, .identity = DRIVER_NAME,
}; };
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
struct inode *inode = file->f_path.dentry->d_inode;
int index = iminor(inode) - WD0_MINOR; int index = iminor(inode) - WD0_MINOR;
struct cpwd *p = cpwd_device; struct cpwd *p = cpwd_device;
int setopt = 0; int setopt = 0;
...@@ -442,7 +443,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file, ...@@ -442,7 +443,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file,
cpwd_starttimer(p, index); cpwd_starttimer(p, index);
} else { } else {
return -EINVAL; return -EINVAL;
} }
break; break;
/* Solaris-compatible IOCTLs */ /* Solaris-compatible IOCTLs */
...@@ -458,7 +459,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file, ...@@ -458,7 +459,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file,
case WIOCSTOP: case WIOCSTOP:
if (p->enabled) if (p->enabled)
return(-EINVAL); return -EINVAL;
cpwd_stoptimer(p, index); cpwd_stoptimer(p, index);
break; break;
...@@ -481,7 +482,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd, ...@@ -481,7 +482,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,
case WIOCSTOP: case WIOCSTOP:
case WIOCGSTAT: case WIOCGSTAT:
lock_kernel(); lock_kernel();
rval = cpwd_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); rval = cpwd_ioctl(file, cmd, arg);
unlock_kernel(); unlock_kernel();
break; break;
...@@ -493,7 +494,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd, ...@@ -493,7 +494,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,
return rval; return rval;
} }
static ssize_t cpwd_write(struct file *file, const char __user *buf, static ssize_t cpwd_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct inode *inode = file->f_path.dentry->d_inode; struct inode *inode = file->f_path.dentry->d_inode;
...@@ -508,20 +509,20 @@ static ssize_t cpwd_write(struct file *file, const char __user *buf, ...@@ -508,20 +509,20 @@ static ssize_t cpwd_write(struct file *file, const char __user *buf,
return 0; return 0;
} }
static ssize_t cpwd_read(struct file * file, char __user *buffer, static ssize_t cpwd_read(struct file *file, char __user *buffer,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
return -EINVAL; return -EINVAL;
} }
static const struct file_operations cpwd_fops = { static const struct file_operations cpwd_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = cpwd_ioctl, .unlocked_ioctl = cpwd_ioctl,
.compat_ioctl = cpwd_compat_ioctl, .compat_ioctl = cpwd_compat_ioctl,
.open = cpwd_open, .open = cpwd_open,
.write = cpwd_write, .write = cpwd_write,
.read = cpwd_read, .read = cpwd_read,
.release = cpwd_release, .release = cpwd_release,
}; };
static int __devinit cpwd_probe(struct of_device *op, static int __devinit cpwd_probe(struct of_device *op,
......
drivers/watchdog/davinci_wdt.c
View file @ 8690d8a9
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include <linux/device.h>
#define MODULE_NAME "DAVINCI-WDT: " #define MODULE_NAME "DAVINCI-WDT: "
...@@ -75,9 +75,9 @@ static void wdt_service(void) ...@@ -75,9 +75,9 @@ static void wdt_service(void)
spin_lock(&io_lock); spin_lock(&io_lock);
/* put watchdog in service state */ /* put watchdog in service state */
davinci_writel(WDKEY_SEQ0, wdt_base + WDTCR); iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
/* put watchdog in active state */ /* put watchdog in active state */
davinci_writel(WDKEY_SEQ1, wdt_base + WDTCR); iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
spin_unlock(&io_lock); spin_unlock(&io_lock);
} }
...@@ -90,29 +90,29 @@ static void wdt_enable(void) ...@@ -90,29 +90,29 @@ static void wdt_enable(void)
spin_lock(&io_lock); spin_lock(&io_lock);
/* disable, internal clock source */ /* disable, internal clock source */
davinci_writel(0, wdt_base + TCR); iowrite32(0, wdt_base + TCR);
/* reset timer, set mode to 64-bit watchdog, and unreset */ /* reset timer, set mode to 64-bit watchdog, and unreset */
davinci_writel(0, wdt_base + TGCR); iowrite32(0, wdt_base + TGCR);
tgcr = TIMMODE_64BIT_WDOG | TIM12RS_UNRESET | TIM34RS_UNRESET; tgcr = TIMMODE_64BIT_WDOG | TIM12RS_UNRESET | TIM34RS_UNRESET;
davinci_writel(tgcr, wdt_base + TGCR); iowrite32(tgcr, wdt_base + TGCR);
/* clear counter regs */ /* clear counter regs */
davinci_writel(0, wdt_base + TIM12); iowrite32(0, wdt_base + TIM12);
davinci_writel(0, wdt_base + TIM34); iowrite32(0, wdt_base + TIM34);
/* set timeout period */ /* set timeout period */
timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) & 0xffffffff); timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) & 0xffffffff);
davinci_writel(timer_margin, wdt_base + PRD12); iowrite32(timer_margin, wdt_base + PRD12);
timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) >> 32); timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) >> 32);
davinci_writel(timer_margin, wdt_base + PRD34); iowrite32(timer_margin, wdt_base + PRD34);
/* enable run continuously */ /* enable run continuously */
davinci_writel(ENAMODE12_PERIODIC, wdt_base + TCR); iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
/* Once the WDT is in pre-active state write to /* Once the WDT is in pre-active state write to
* TIM12, TIM34, PRD12, PRD34, TCR, TGCR, WDTCR are * TIM12, TIM34, PRD12, PRD34, TCR, TGCR, WDTCR are
* write protected (except for the WDKEY field) * write protected (except for the WDKEY field)
*/ */
/* put watchdog in pre-active state */ /* put watchdog in pre-active state */
davinci_writel(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR); iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
/* put watchdog in active state */ /* put watchdog in active state */
davinci_writel(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR); iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
spin_unlock(&io_lock); spin_unlock(&io_lock);
} }
...@@ -197,17 +197,16 @@ static int davinci_wdt_probe(struct platform_device *pdev) ...@@ -197,17 +197,16 @@ static int davinci_wdt_probe(struct platform_device *pdev)
{ {
int ret = 0, size; int ret = 0, size;
struct resource *res; struct resource *res;
struct device *dev = &pdev->dev;
if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT) if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
heartbeat = DEFAULT_HEARTBEAT; heartbeat = DEFAULT_HEARTBEAT;
printk(KERN_INFO MODULE_NAME dev_info(dev, "heartbeat %d sec\n", heartbeat);
"DaVinci Watchdog Timer: heartbeat %d sec\n", heartbeat);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) { if (res == NULL) {
printk(KERN_INFO MODULE_NAME dev_err(dev, "failed to get memory region resource\n");
"failed to get memory region resource\n");
return -ENOENT; return -ENOENT;
} }
...@@ -215,20 +214,26 @@ static int davinci_wdt_probe(struct platform_device *pdev) ...@@ -215,20 +214,26 @@ static int davinci_wdt_probe(struct platform_device *pdev)
wdt_mem = request_mem_region(res->start, size, pdev->name); wdt_mem = request_mem_region(res->start, size, pdev->name);
if (wdt_mem == NULL) { if (wdt_mem == NULL) {
printk(KERN_INFO MODULE_NAME "failed to get memory region\n"); dev_err(dev, "failed to get memory region\n");
return -ENOENT; return -ENOENT;
} }
wdt_base = (void __iomem *)(res->start);
wdt_base = ioremap(res->start, size);
if (!wdt_base) {
dev_err(dev, "failed to map memory region\n");
return -ENOMEM;
}
ret = misc_register(&davinci_wdt_miscdev); ret = misc_register(&davinci_wdt_miscdev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR MODULE_NAME "cannot register misc device\n"); dev_err(dev, "cannot register misc device\n");
release_resource(wdt_mem); release_resource(wdt_mem);
kfree(wdt_mem); kfree(wdt_mem);
} else { } else {
set_bit(WDT_DEVICE_INITED, &wdt_status); set_bit(WDT_DEVICE_INITED, &wdt_status);
} }
iounmap(wdt_base);
return ret; return ret;
} }
......
drivers/watchdog/eurotechwdt.c
View file @ 8690d8a9
...@@ -8,19 +8,19 @@ ...@@ -8,19 +8,19 @@
* Based on wdt.c. * Based on wdt.c.
* Original copyright messages: * Original copyright messages:
* *
* (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>, * (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
* All Rights Reserved. * All Rights Reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide
* warranty for any of this software. This material is provided * warranty for any of this software. This material is provided
* "AS-IS" and at no charge. * "AS-IS" and at no charge.
* *
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>* * (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>*
*/ */
/* Changelog: /* Changelog:
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* add expect_close support * add expect_close support
* *
* 2002.05.30 - Joel Becker <joel.becker@oracle.com> * 2002.05.30 - Joel Becker <joel.becker@oracle.com>
* Added Matt Domsch's nowayout module option. * Added Matt Domsch's nowayout module option.
*/ */
/* /*
...@@ -151,7 +151,7 @@ static void eurwdt_activate_timer(void) ...@@ -151,7 +151,7 @@ static void eurwdt_activate_timer(void)
if (irq == 0) if (irq == 0)
printk(KERN_INFO ": interrupt disabled\n"); printk(KERN_INFO ": interrupt disabled\n");
eurwdt_write_reg(WDT_TIMER_CFG, irq<<4); eurwdt_write_reg(WDT_TIMER_CFG, irq << 4);
eurwdt_write_reg(WDT_UNIT_SEL, WDT_UNIT_SECS); /* we use seconds */ eurwdt_write_reg(WDT_UNIT_SEL, WDT_UNIT_SECS); /* we use seconds */
eurwdt_set_timeout(0); /* the default timeout */ eurwdt_set_timeout(0); /* the default timeout */
......
drivers/watchdog/geodewdt.c
View file @ 8690d8a9
...@@ -34,11 +34,15 @@ ...@@ -34,11 +34,15 @@
static int timeout = WATCHDOG_TIMEOUT; static int timeout = WATCHDOG_TIMEOUT;
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=131, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) "."); MODULE_PARM_DESC(timeout,
"Watchdog timeout in seconds. 1<= timeout <=131, default="
__MODULE_STRING(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_STRING(WATCHDOG_NOWAYOUT) ")"); MODULE_PARM_DESC(nowayout,
"Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
static struct platform_device *geodewdt_platform_device; static struct platform_device *geodewdt_platform_device;
static unsigned long wdt_flags; static unsigned long wdt_flags;
...@@ -269,7 +273,8 @@ static int __init geodewdt_init(void) ...@@ -269,7 +273,8 @@ static int __init geodewdt_init(void)
if (ret) if (ret)
return ret; return ret;
geodewdt_platform_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0); geodewdt_platform_device = platform_device_register_simple(DRV_NAME,
-1, NULL, 0);
if (IS_ERR(geodewdt_platform_device)) { if (IS_ERR(geodewdt_platform_device)) {
ret = PTR_ERR(geodewdt_platform_device); ret = PTR_ERR(geodewdt_platform_device);
goto err; goto err;
......
drivers/watchdog/hpwdt.c
View file @ 8690d8a9
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#define PCI_BIOS32_PARAGRAPH_LEN 16 #define PCI_BIOS32_PARAGRAPH_LEN 16
#define PCI_ROM_BASE1 0x000F0000 #define PCI_ROM_BASE1 0x000F0000
#define ROM_SIZE 0x10000 #define ROM_SIZE 0x10000
#define HPWDT_VERSION "1.01"
struct bios32_service_dir { struct bios32_service_dir {
u32 signature; u32 signature;
...@@ -130,17 +131,14 @@ static void *cru_rom_addr; ...@@ -130,17 +131,14 @@ static void *cru_rom_addr;
static struct cmn_registers cmn_regs; static struct cmn_registers cmn_regs;
static struct pci_device_id hpwdt_devices[] = { static struct pci_device_id hpwdt_devices[] = {
{ { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },
.vendor = PCI_VENDOR_ID_COMPAQ, { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },
.device = 0xB203,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
{0}, /* terminate list */ {0}, /* terminate list */
}; };
MODULE_DEVICE_TABLE(pci, hpwdt_devices); MODULE_DEVICE_TABLE(pci, hpwdt_devices);
extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, unsigned long *pRomEntry); extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
unsigned long *pRomEntry);
#ifndef CONFIG_X86_64 #ifndef CONFIG_X86_64
/* --32 Bit Bios------------------------------------------------------------ */ /* --32 Bit Bios------------------------------------------------------------ */
...@@ -605,7 +603,7 @@ static long hpwdt_ioctl(struct file *file, unsigned int cmd, ...@@ -605,7 +603,7 @@ static long hpwdt_ioctl(struct file *file, unsigned int cmd,
/* /*
* Kernel interfaces * Kernel interfaces
*/ */
static struct file_operations hpwdt_fops = { static const struct file_operations hpwdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = hpwdt_write, .write = hpwdt_write,
...@@ -704,10 +702,11 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, ...@@ -704,10 +702,11 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
} }
printk(KERN_INFO printk(KERN_INFO
"hp Watchdog Timer Driver: 1.00" "hp Watchdog Timer Driver: %s"
", timer margin: %d seconds (nowayout=%d)" ", timer margin: %d seconds (nowayout=%d)"
", allow kernel dump: %s (default = 0/OFF).\n", ", allow kernel dump: %s (default = 0/OFF).\n",
soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON"); HPWDT_VERSION, soft_margin, nowayout,
(allow_kdump == 0) ? "OFF" : "ON");
return 0; return 0;
...@@ -757,6 +756,7 @@ static int __init hpwdt_init(void) ...@@ -757,6 +756,7 @@ static int __init hpwdt_init(void)
MODULE_AUTHOR("Tom Mingarelli"); MODULE_AUTHOR("Tom Mingarelli");
MODULE_DESCRIPTION("hp watchdog driver"); MODULE_DESCRIPTION("hp watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(HPWDT_VERSION);
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
module_param(soft_margin, int, 0); module_param(soft_margin, int, 0);
......
drivers/watchdog/i6300esb.c
View file @ 8690d8a9
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* *
* The timer is implemented in the following I/O controller hubs: * The timer is implemented in the following I/O controller hubs:
* (See the intel documentation on http://developer.intel.com.) * (See the intel documentation on http://developer.intel.com.)
* 6300ESB chip : document number 300641-003 * 6300ESB chip : document number 300641-004
* *
* 2004YYZZ Ross Biro * 2004YYZZ Ross Biro
* Initial version 0.01 * Initial version 0.01
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/reboot.h> #include <linux/platform_device.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <linux/io.h> #include <linux/io.h>
/* Module and version information */ /* Module and version information */
#define ESB_VERSION "0.03" #define ESB_VERSION "0.04"
#define ESB_MODULE_NAME "i6300ESB timer" #define ESB_MODULE_NAME "i6300ESB timer"
#define ESB_DRIVER_NAME ESB_MODULE_NAME ", v" ESB_VERSION #define ESB_DRIVER_NAME ESB_MODULE_NAME ", v" ESB_VERSION
#define PFX ESB_MODULE_NAME ": " #define PFX ESB_MODULE_NAME ": "
...@@ -81,6 +81,7 @@ static unsigned long timer_alive; ...@@ -81,6 +81,7 @@ static unsigned long timer_alive;
static struct pci_dev *esb_pci; static struct pci_dev *esb_pci;
static unsigned short triggered; /* The status of the watchdog upon boot */ static unsigned short triggered; /* The status of the watchdog upon boot */
static char esb_expect_close; static char esb_expect_close;
static struct platform_device *esb_platform_device;
/* module parameters */ /* module parameters */
/* 30 sec default heartbeat (1 < heartbeat < 2*1023) */ /* 30 sec default heartbeat (1 < heartbeat < 2*1023) */
...@@ -114,13 +115,18 @@ static inline void esb_unlock_registers(void) ...@@ -114,13 +115,18 @@ static inline void esb_unlock_registers(void)
writeb(ESB_UNLOCK2, ESB_RELOAD_REG); writeb(ESB_UNLOCK2, ESB_RELOAD_REG);
} }
static void esb_timer_start(void) static int esb_timer_start(void)
{ {
u8 val; u8 val;
spin_lock(&esb_lock);
esb_unlock_registers();
writew(ESB_WDT_RELOAD, ESB_RELOAD_REG);
/* Enable or Enable + Lock? */ /* Enable or Enable + Lock? */
val = 0x02 | (nowayout ? 0x01 : 0x00); val = 0x02 | (nowayout ? 0x01 : 0x00);
pci_write_config_byte(esb_pci, ESB_LOCK_REG, val); pci_write_config_byte(esb_pci, ESB_LOCK_REG, val);
spin_unlock(&esb_lock);
return 0;
} }
static int esb_timer_stop(void) static int esb_timer_stop(void)
...@@ -207,7 +213,6 @@ static int esb_open(struct inode *inode, struct file *file) ...@@ -207,7 +213,6 @@ static int esb_open(struct inode *inode, struct file *file)
return -EBUSY; return -EBUSY;
/* Reload and activate timer */ /* Reload and activate timer */
esb_timer_keepalive();
esb_timer_start(); esb_timer_start();
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
...@@ -240,7 +245,8 @@ static ssize_t esb_write(struct file *file, const char __user *data, ...@@ -240,7 +245,8 @@ static ssize_t esb_write(struct file *file, const char __user *data,
* five months ago... */ * five months ago... */
esb_expect_close = 0; esb_expect_close = 0;
/* scan to see whether or not we got the magic character */ /* scan to see whether or not we got the
* magic character */
for (i = 0; i != len; i++) { for (i = 0; i != len; i++) {
char c; char c;
if (get_user(c, data + i)) if (get_user(c, data + i))
...@@ -292,7 +298,6 @@ static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -292,7 +298,6 @@ static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} }
if (new_options & WDIOS_ENABLECARD) { if (new_options & WDIOS_ENABLECARD) {
esb_timer_keepalive();
esb_timer_start(); esb_timer_start();
retval = 0; retval = 0;
} }
...@@ -318,19 +323,6 @@ static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -318,19 +323,6 @@ static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} }
} }
/*
* Notify system
*/
static int esb_notify_sys(struct notifier_block *this,
unsigned long code, void *unused)
{
if (code == SYS_DOWN || code == SYS_HALT)
esb_timer_stop(); /* Turn the WDT off */
return NOTIFY_DONE;
}
/* /*
* Kernel Interfaces * Kernel Interfaces
*/ */
...@@ -350,10 +342,6 @@ static struct miscdevice esb_miscdev = { ...@@ -350,10 +342,6 @@ static struct miscdevice esb_miscdev = {
.fops = &esb_fops, .fops = &esb_fops,
}; };
static struct notifier_block esb_notifier = {
.notifier_call = esb_notify_sys,
};
/* /*
* Data for PCI driver interface * Data for PCI driver interface
* *
...@@ -372,7 +360,7 @@ MODULE_DEVICE_TABLE(pci, esb_pci_tbl); ...@@ -372,7 +360,7 @@ MODULE_DEVICE_TABLE(pci, esb_pci_tbl);
* Init & exit routines * Init & exit routines
*/ */
static unsigned char __init esb_getdevice(void) static unsigned char __devinit esb_getdevice(void)
{ {
u8 val1; u8 val1;
unsigned short val2; unsigned short val2;
...@@ -443,7 +431,7 @@ static unsigned char __init esb_getdevice(void) ...@@ -443,7 +431,7 @@ static unsigned char __init esb_getdevice(void)
return 0; return 0;
} }
static int __init watchdog_init(void) static int __devinit esb_probe(struct platform_device *dev)
{ {
int ret; int ret;
...@@ -459,19 +447,13 @@ static int __init watchdog_init(void) ...@@ -459,19 +447,13 @@ static int __init watchdog_init(void)
"heartbeat value must be 1<heartbeat<2046, using %d\n", "heartbeat value must be 1<heartbeat<2046, using %d\n",
heartbeat); heartbeat);
} }
ret = register_reboot_notifier(&esb_notifier);
if (ret != 0) {
printk(KERN_ERR PFX
"cannot register reboot notifier (err=%d)\n", ret);
goto err_unmap;
}
ret = misc_register(&esb_miscdev); ret = misc_register(&esb_miscdev);
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR PFX printk(KERN_ERR PFX
"cannot register miscdev on minor=%d (err=%d)\n", "cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, ret); WATCHDOG_MINOR, ret);
goto err_notifier; goto err_unmap;
} }
esb_timer_stop(); esb_timer_stop();
printk(KERN_INFO PFX printk(KERN_INFO PFX
...@@ -479,8 +461,6 @@ static int __init watchdog_init(void) ...@@ -479,8 +461,6 @@ static int __init watchdog_init(void)
BASEADDR, heartbeat, nowayout); BASEADDR, heartbeat, nowayout);
return 0; return 0;
err_notifier:
unregister_reboot_notifier(&esb_notifier);
err_unmap: err_unmap:
iounmap(BASEADDR); iounmap(BASEADDR);
/* err_release: */ /* err_release: */
...@@ -492,7 +472,7 @@ static int __init watchdog_init(void) ...@@ -492,7 +472,7 @@ static int __init watchdog_init(void)
return ret; return ret;
} }
static void __exit watchdog_cleanup(void) static int __devexit esb_remove(struct platform_device *dev)
{ {
/* Stop the timer before we leave */ /* Stop the timer before we leave */
if (!nowayout) if (!nowayout)
...@@ -500,11 +480,58 @@ static void __exit watchdog_cleanup(void) ...@@ -500,11 +480,58 @@ static void __exit watchdog_cleanup(void)
/* Deregister */ /* Deregister */
misc_deregister(&esb_miscdev); misc_deregister(&esb_miscdev);
unregister_reboot_notifier(&esb_notifier);
iounmap(BASEADDR); iounmap(BASEADDR);
pci_release_region(esb_pci, 0); pci_release_region(esb_pci, 0);
pci_disable_device(esb_pci); pci_disable_device(esb_pci);
pci_dev_put(esb_pci); pci_dev_put(esb_pci);
return 0;
}
static void esb_shutdown(struct platform_device *dev)
{
esb_timer_stop();
}
static struct platform_driver esb_platform_driver = {
.probe = esb_probe,
.remove = __devexit_p(esb_remove),
.shutdown = esb_shutdown,
.driver = {
.owner = THIS_MODULE,
.name = ESB_MODULE_NAME,
},
};
static int __init watchdog_init(void)
{
int err;
printk(KERN_INFO PFX "Intel 6300ESB WatchDog Timer Driver v%s\n",
ESB_VERSION);
err = platform_driver_register(&esb_platform_driver);
if (err)
return err;
esb_platform_device = platform_device_register_simple(ESB_MODULE_NAME,
-1, NULL, 0);
if (IS_ERR(esb_platform_device)) {
err = PTR_ERR(esb_platform_device);
goto unreg_platform_driver;
}
return 0;
unreg_platform_driver:
platform_driver_unregister(&esb_platform_driver);
return err;
}
static void __exit watchdog_cleanup(void)
{
platform_device_unregister(esb_platform_device);
platform_driver_unregister(&esb_platform_driver);
printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
} }
module_init(watchdog_init); module_init(watchdog_init);
......
drivers/watchdog/iTCO_vendor_support.c
View file @ 8690d8a9
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
static int vendorsupport; static int vendorsupport;
module_param(vendorsupport, int, 0); module_param(vendorsupport, int, 0);
MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (none), 1=SuperMicro Pent3, 2=SuperMicro Pent4+"); MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default="
"0 (none), 1=SuperMicro Pent3, 2=SuperMicro Pent4+");
/* /*
* Vendor Specific Support * Vendor Specific Support
...@@ -305,7 +306,8 @@ static void __exit iTCO_vendor_exit_module(void) ...@@ -305,7 +306,8 @@ static void __exit iTCO_vendor_exit_module(void)
module_init(iTCO_vendor_init_module); module_init(iTCO_vendor_init_module);
module_exit(iTCO_vendor_exit_module); module_exit(iTCO_vendor_exit_module);
MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>, R. Seretny <lkpatches@paypc.com>"); MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>, "
"R. Seretny <lkpatches@paypc.com>");
MODULE_DESCRIPTION("Intel TCO Vendor Specific WatchDog Timer Driver Support"); MODULE_DESCRIPTION("Intel TCO Vendor Specific WatchDog Timer Driver Support");
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
drivers/watchdog/iTCO_wdt.c
View file @ 8690d8a9
...@@ -273,7 +273,9 @@ static struct platform_device *iTCO_wdt_platform_device; ...@@ -273,7 +273,9 @@ static struct platform_device *iTCO_wdt_platform_device;
#define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */ #define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */
static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
"(2<heartbeat<39 (TCO v1) or 613 (TCO v2), default="
__MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
static int nowayout = WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
...@@ -346,7 +348,8 @@ static int iTCO_wdt_start(void) ...@@ -346,7 +348,8 @@ static int iTCO_wdt_start(void)
/* disable chipset's NO_REBOOT bit */ /* disable chipset's NO_REBOOT bit */
if (iTCO_wdt_unset_NO_REBOOT_bit()) { if (iTCO_wdt_unset_NO_REBOOT_bit()) {
spin_unlock(&iTCO_wdt_private.io_lock); spin_unlock(&iTCO_wdt_private.io_lock);
printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n"); printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, "
"reboot disabled by hardware\n");
return -EIO; return -EIO;
} }
...@@ -669,7 +672,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, ...@@ -669,7 +672,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
/* Check chipset's NO_REBOOT bit */ /* Check chipset's NO_REBOOT bit */
if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) { if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) {
printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n"); printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, "
"reboot disabled by hardware\n");
ret = -ENODEV; /* Cannot reset NO_REBOOT bit */ ret = -ENODEV; /* Cannot reset NO_REBOOT bit */
goto out; goto out;
} }
...@@ -716,8 +720,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, ...@@ -716,8 +720,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
if not reset to the default */ if not reset to the default */
if (iTCO_wdt_set_heartbeat(heartbeat)) { if (iTCO_wdt_set_heartbeat(heartbeat)) {
iTCO_wdt_set_heartbeat(WATCHDOG_HEARTBEAT); iTCO_wdt_set_heartbeat(WATCHDOG_HEARTBEAT);
printk(KERN_INFO PFX "heartbeat value must be 2 < heartbeat < 39 (TCO v1) or 613 (TCO v2), using %d\n", printk(KERN_INFO PFX
heartbeat); "heartbeat value must be 2 < heartbeat < 39 (TCO v1) "
"or 613 (TCO v2), using %d\n", heartbeat);
} }
ret = misc_register(&iTCO_wdt_miscdev); ret = misc_register(&iTCO_wdt_miscdev);
......
drivers/watchdog/it87_wdt.c
View file @ 8690d8a9
...@@ -188,8 +188,8 @@ static inline int superio_inb(int reg) ...@@ -188,8 +188,8 @@ static inline int superio_inb(int reg)
static inline void superio_outb(int val, int reg) static inline void superio_outb(int val, int reg)
{ {
outb(reg, REG); outb(reg, REG);
outb(val, VAL); outb(val, VAL);
} }
static inline int superio_inw(int reg) static inline int superio_inw(int reg)
...@@ -204,10 +204,10 @@ static inline int superio_inw(int reg) ...@@ -204,10 +204,10 @@ static inline int superio_inw(int reg)
static inline void superio_outw(int val, int reg) static inline void superio_outw(int val, int reg)
{ {
outb(reg++, REG); outb(reg++, REG);
outb(val >> 8, VAL); outb(val >> 8, VAL);
outb(reg, REG); outb(reg, REG);
outb(val, VAL); outb(val, VAL);
} }
/* watchdog timer handling */ /* watchdog timer handling */
......
drivers/watchdog/mpc5200_wdt.c
View file @ 8690d8a9
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <asm/mpc52xx.h> #include <asm/mpc52xx.h>
#define GPT_MODE_WDT (1<<15) #define GPT_MODE_WDT (1 << 15)
#define GPT_MODE_CE (1<<12) #define GPT_MODE_CE (1 << 12)
#define GPT_MODE_MS_TIMER (0x4) #define GPT_MODE_MS_TIMER (0x4)
......
drivers/watchdog/mpcore_wdt.c
View file @ 8690d8a9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Based on the SoftDog driver: * Based on the SoftDog driver:
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
* All Rights Reserved. * All Rights Reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
......
drivers/watchdog/mtx-1_wdt.c
View file @ 8690d8a9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* All Rights Reserved. * All Rights Reserved.
* http://www.4g-systems.biz * http://www.4g-systems.biz
* *
* (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org> * (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
......
drivers/watchdog/orion5x_wdt.c
View file @ 8690d8a9
...@@ -16,11 +16,13 @@ ...@@ -16,11 +16,13 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <plat/orion5x_wdt.h>
/* /*
* Watchdog timer block registers. * Watchdog timer block registers.
...@@ -29,13 +31,14 @@ ...@@ -29,13 +31,14 @@
#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_CYCLE_COUNT 0xffffffff
#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
static int nowayout = WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
static int heartbeat = WDT_MAX_DURATION; /* (seconds) */ static int heartbeat = -1; /* module parameter (seconds) */
static unsigned int wdt_max_duration; /* (seconds) */
static unsigned int wdt_tclk;
static unsigned long wdt_status; static unsigned long wdt_status;
static spinlock_t wdt_lock; static spinlock_t wdt_lock;
...@@ -46,7 +49,7 @@ static void wdt_enable(void) ...@@ -46,7 +49,7 @@ static void wdt_enable(void)
spin_lock(&wdt_lock); spin_lock(&wdt_lock);
/* Set watchdog duration */ /* Set watchdog duration */
writel(ORION5X_TCLK * heartbeat, WDT_VAL); writel(wdt_tclk * heartbeat, WDT_VAL);
/* Clear watchdog timer interrupt */ /* Clear watchdog timer interrupt */
reg = readl(BRIDGE_CAUSE); reg = readl(BRIDGE_CAUSE);
...@@ -88,7 +91,7 @@ static void wdt_disable(void) ...@@ -88,7 +91,7 @@ static void wdt_disable(void)
static int orion5x_wdt_get_timeleft(int *time_left) static int orion5x_wdt_get_timeleft(int *time_left)
{ {
spin_lock(&wdt_lock); spin_lock(&wdt_lock);
*time_left = readl(WDT_VAL) / ORION5X_TCLK; *time_left = readl(WDT_VAL) / wdt_tclk;
spin_unlock(&wdt_lock); spin_unlock(&wdt_lock);
return 0; return 0;
} }
...@@ -158,7 +161,7 @@ static long orion5x_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -158,7 +161,7 @@ static long orion5x_wdt_ioctl(struct file *file, unsigned int cmd,
if (ret) if (ret)
break; break;
if (time <= 0 || time > WDT_MAX_DURATION) { if (time <= 0 || time > wdt_max_duration) {
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
...@@ -210,23 +213,69 @@ static struct miscdevice orion5x_wdt_miscdev = { ...@@ -210,23 +213,69 @@ static struct miscdevice orion5x_wdt_miscdev = {
.fops = &orion5x_wdt_fops, .fops = &orion5x_wdt_fops,
}; };
static int __init orion5x_wdt_init(void) static int __devinit orion5x_wdt_probe(struct platform_device *pdev)
{ {
struct orion5x_wdt_platform_data *pdata = pdev->dev.platform_data;
int ret; int ret;
spin_lock_init(&wdt_lock); if (pdata) {
wdt_tclk = pdata->tclk;
} else {
printk(KERN_ERR "Orion5x Watchdog misses platform data\n");
return -ENODEV;
}
if (orion5x_wdt_miscdev.parent)
return -EBUSY;
orion5x_wdt_miscdev.parent = &pdev->dev;
wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk;
if (heartbeat <= 0 || heartbeat > wdt_max_duration)
heartbeat = wdt_max_duration;
ret = misc_register(&orion5x_wdt_miscdev); ret = misc_register(&orion5x_wdt_miscdev);
if (ret == 0) if (ret)
printk("Orion5x Watchdog Timer: heartbeat %d sec\n", return ret;
heartbeat);
printk(KERN_INFO "Orion5x Watchdog Timer: Initial timeout %d sec%s\n",
heartbeat, nowayout ? ", nowayout" : "");
return 0;
}
static int __devexit orion5x_wdt_remove(struct platform_device *pdev)
{
int ret;
if (test_bit(WDT_IN_USE, &wdt_status)) {
wdt_disable();
clear_bit(WDT_IN_USE, &wdt_status);
}
ret = misc_deregister(&orion5x_wdt_miscdev);
if (!ret)
orion5x_wdt_miscdev.parent = NULL;
return ret; return ret;
} }
static struct platform_driver orion5x_wdt_driver = {
.probe = orion5x_wdt_probe,
.remove = __devexit_p(orion5x_wdt_remove),
.driver = {
.owner = THIS_MODULE,
.name = "orion5x_wdt",
},
};
static int __init orion5x_wdt_init(void)
{
spin_lock_init(&wdt_lock);
return platform_driver_register(&orion5x_wdt_driver);
}
static void __exit orion5x_wdt_exit(void) static void __exit orion5x_wdt_exit(void)
{ {
misc_deregister(&orion5x_wdt_miscdev); platform_driver_unregister(&orion5x_wdt_driver);
} }
module_init(orion5x_wdt_init); module_init(orion5x_wdt_init);
...@@ -236,8 +285,7 @@ MODULE_AUTHOR("Sylver Bruneau <sylver.bruneau@googlemail.com>"); ...@@ -236,8 +285,7 @@ MODULE_AUTHOR("Sylver Bruneau <sylver.bruneau@googlemail.com>");
MODULE_DESCRIPTION("Orion5x Processor Watchdog"); MODULE_DESCRIPTION("Orion5x Processor Watchdog");
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default is " MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds");
__MODULE_STRING(WDT_MAX_DURATION) ")");
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
......
drivers/watchdog/pc87413_wdt.c
View file @ 8690d8a9
...@@ -536,7 +536,8 @@ static int __init pc87413_init(void) ...@@ -536,7 +536,8 @@ static int __init pc87413_init(void)
ret = misc_register(&pc87413_miscdev); ret = misc_register(&pc87413_miscdev);
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", printk(KERN_ERR PFX
"cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, ret); WATCHDOG_MINOR, ret);
unregister_reboot_notifier(&pc87413_notifier); unregister_reboot_notifier(&pc87413_notifier);
return ret; return ret;
...@@ -574,7 +575,8 @@ static void __exit pc87413_exit(void) ...@@ -574,7 +575,8 @@ static void __exit pc87413_exit(void)
module_init(pc87413_init); module_init(pc87413_init);
module_exit(pc87413_exit); module_exit(pc87413_exit);
MODULE_AUTHOR("Sven Anders <anders@anduras.de>, Marcus Junker <junker@anduras.de>,"); MODULE_AUTHOR("Sven Anders <anders@anduras.de>, "
"Marcus Junker <junker@anduras.de>,");
MODULE_DESCRIPTION("PC87413 WDT driver"); MODULE_DESCRIPTION("PC87413 WDT driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
drivers/watchdog/pcwd.c
View file @ 8690d8a9
...@@ -24,25 +24,25 @@ ...@@ -24,25 +24,25 @@
* version reporting. Added read routine for temperature. * version reporting. Added read routine for temperature.
* Removed some extra defines, added an autodetect Revision * Removed some extra defines, added an autodetect Revision
* routine. * routine.
* 961006 Revised some documentation, fixed some cosmetic bugs. Made * 961006 Revised some documentation, fixed some cosmetic bugs. Made
* drivers to panic the system if it's overheating at bootup. * drivers to panic the system if it's overheating at bootup.
* 961118 Changed some verbiage on some of the output, tidied up * 961118 Changed some verbiage on some of the output, tidied up
* code bits, and added compatibility to 2.1.x. * code bits, and added compatibility to 2.1.x.
* 970912 Enabled board on open and disable on close. * 970912 Enabled board on open and disable on close.
* 971107 Took account of recent VFS changes (broke read). * 971107 Took account of recent VFS changes (broke read).
* 971210 Disable board on initialisation in case board already ticking. * 971210 Disable board on initialisation in case board already ticking.
* 971222 Changed open/close for temperature handling * 971222 Changed open/close for temperature handling
* Michael Meskes <meskes@debian.org>. * Michael Meskes <meskes@debian.org>.
* 980112 Used minor numbers from include/linux/miscdevice.h * 980112 Used minor numbers from include/linux/miscdevice.h
* 990403 Clear reset status after reading control status register in * 990403 Clear reset status after reading control status register in
* pcwd_showprevstate(). [Marc Boucher <marc@mbsi.ca>] * pcwd_showprevstate(). [Marc Boucher <marc@mbsi.ca>]
* 990605 Made changes to code to support Firmware 1.22a, added * 990605 Made changes to code to support Firmware 1.22a, added
* fairly useless proc entry. * fairly useless proc entry.
* 990610 removed said useless proc code for the merge <alan> * 990610 removed said useless proc code for the merge <alan>
* 000403 Removed last traces of proc code. <davej> * 000403 Removed last traces of proc code. <davej>
* 011214 Added nowayout module option to override * 011214 Added nowayout module option to override
* CONFIG_WATCHDOG_NOWAYOUT <Matt_Domsch@dell.com> * CONFIG_WATCHDOG_NOWAYOUT <Matt_Domsch@dell.com>
* Added timeout module option to override default * Added timeout module option to override default
*/ */
/* /*
...@@ -76,8 +76,7 @@ ...@@ -76,8 +76,7 @@
#define WATCHDOG_DRIVER_NAME "ISA-PC Watchdog" #define WATCHDOG_DRIVER_NAME "ISA-PC Watchdog"
#define WATCHDOG_NAME "pcwd" #define WATCHDOG_NAME "pcwd"
#define PFX WATCHDOG_NAME ": " #define PFX WATCHDOG_NAME ": "
#define DRIVER_VERSION WATCHDOG_DRIVER_NAME " driver, v" WATCHDOG_VERSION " (" WATCHDOG_DATE ")\n" #define DRIVER_VERSION WATCHDOG_DRIVER_NAME " driver, v" WATCHDOG_VERSION "\n"
#define WD_VER WATCHDOG_VERSION " (" WATCHDOG_DATE ")"
/* /*
* It should be noted that PCWD_REVISION_B was removed because A and B * It should be noted that PCWD_REVISION_B was removed because A and B
...@@ -200,7 +199,9 @@ MODULE_PARM_DESC(debug, ...@@ -200,7 +199,9 @@ MODULE_PARM_DESC(debug,
#define WATCHDOG_HEARTBEAT 0 #define WATCHDOG_HEARTBEAT 0
static int heartbeat = WATCHDOG_HEARTBEAT; static int heartbeat = WATCHDOG_HEARTBEAT;
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2 <= heartbeat <= 7200 or 0=delay-time from dip-switches, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
"(2 <= heartbeat <= 7200 or 0=delay-time from dip-switches, default="
__MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
static int nowayout = WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
...@@ -239,7 +240,8 @@ static int send_isa_command(int cmd) ...@@ -239,7 +240,8 @@ static int send_isa_command(int cmd)
} }
if (debug >= DEBUG) if (debug >= DEBUG)
printk(KERN_DEBUG PFX "received following data for cmd=0x%02x: port0=0x%02x last_port0=0x%02x\n", printk(KERN_DEBUG PFX "received following data for "
"cmd=0x%02x: port0=0x%02x last_port0=0x%02x\n",
cmd, port0, last_port0); cmd, port0, last_port0);
return port0; return port0;
...@@ -339,10 +341,12 @@ static void pcwd_show_card_info(void) ...@@ -339,10 +341,12 @@ static void pcwd_show_card_info(void)
pcwd_private.io_addr); pcwd_private.io_addr);
else if (pcwd_private.revision == PCWD_REVISION_C) { else if (pcwd_private.revision == PCWD_REVISION_C) {
pcwd_get_firmware(); pcwd_get_firmware();
printk(KERN_INFO PFX "ISA-PC Watchdog (REV.C) detected at port 0x%04x (Firmware version: %s)\n", printk(KERN_INFO PFX "ISA-PC Watchdog (REV.C) detected at port "
"0x%04x (Firmware version: %s)\n",
pcwd_private.io_addr, pcwd_private.fw_ver_str); pcwd_private.io_addr, pcwd_private.fw_ver_str);
option_switches = pcwd_get_option_switches(); option_switches = pcwd_get_option_switches();
printk(KERN_INFO PFX "Option switches (0x%02x): Temperature Reset Enable=%s, Power On Delay=%s\n", printk(KERN_INFO PFX "Option switches (0x%02x): "
"Temperature Reset Enable=%s, Power On Delay=%s\n",
option_switches, option_switches,
((option_switches & 0x10) ? "ON" : "OFF"), ((option_switches & 0x10) ? "ON" : "OFF"),
((option_switches & 0x08) ? "ON" : "OFF")); ((option_switches & 0x08) ? "ON" : "OFF"));
...@@ -358,7 +362,8 @@ static void pcwd_show_card_info(void) ...@@ -358,7 +362,8 @@ static void pcwd_show_card_info(void)
printk(KERN_INFO PFX "Temperature Option Detected\n"); printk(KERN_INFO PFX "Temperature Option Detected\n");
if (pcwd_private.boot_status & WDIOF_CARDRESET) if (pcwd_private.boot_status & WDIOF_CARDRESET)
printk(KERN_INFO PFX "Previous reboot was caused by the card\n"); printk(KERN_INFO PFX
"Previous reboot was caused by the card\n");
if (pcwd_private.boot_status & WDIOF_OVERHEAT) { if (pcwd_private.boot_status & WDIOF_OVERHEAT) {
printk(KERN_EMERG PFX printk(KERN_EMERG PFX
...@@ -871,7 +876,7 @@ static int __devinit pcwd_isa_probe(struct device *dev, unsigned int id) ...@@ -871,7 +876,7 @@ static int __devinit pcwd_isa_probe(struct device *dev, unsigned int id)
cards_found++; cards_found++;
if (cards_found == 1) if (cards_found == 1)
printk(KERN_INFO PFX "v%s Ken Hollis (kenji@bitgate.com)\n", printk(KERN_INFO PFX "v%s Ken Hollis (kenji@bitgate.com)\n",
WD_VER); WATCHDOG_VERSION);
if (cards_found > 1) { if (cards_found > 1) {
printk(KERN_ERR PFX "This driver only supports 1 device\n"); printk(KERN_ERR PFX "This driver only supports 1 device\n");
...@@ -1026,7 +1031,8 @@ static void __exit pcwd_cleanup_module(void) ...@@ -1026,7 +1031,8 @@ static void __exit pcwd_cleanup_module(void)
module_init(pcwd_init_module); module_init(pcwd_init_module);
module_exit(pcwd_cleanup_module); module_exit(pcwd_cleanup_module);
MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>, Wim Van Sebroeck <wim@iguana.be>"); MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>, "
"Wim Van Sebroeck <wim@iguana.be>");
MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver"); MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver");
MODULE_VERSION(WATCHDOG_VERSION); MODULE_VERSION(WATCHDOG_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
drivers/watchdog/pcwd_pci.c
View file @ 8690d8a9
This diff is collapsed.
drivers/watchdog/pcwd_usb.c
View file @ 8690d8a9
This diff is collapsed.
drivers/watchdog/pnx4008_wdt.c
View file @ 8690d8a9
...@@ -54,22 +54,22 @@ ...@@ -54,22 +54,22 @@
/* WDTIM_CTRL bit definitions */ /* WDTIM_CTRL bit definitions */
#define COUNT_ENAB 1 #define COUNT_ENAB 1
#define RESET_COUNT (1<<1) #define RESET_COUNT (1 << 1)
#define DEBUG_EN (1<<2) #define DEBUG_EN (1 << 2)
/* WDTIM_MCTRL bit definitions */ /* WDTIM_MCTRL bit definitions */
#define MR0_INT 1 #define MR0_INT 1
#undef RESET_COUNT0 #undef RESET_COUNT0
#define RESET_COUNT0 (1<<2) #define RESET_COUNT0 (1 << 2)
#define STOP_COUNT0 (1<<2) #define STOP_COUNT0 (1 << 2)
#define M_RES1 (1<<3) #define M_RES1 (1 << 3)
#define M_RES2 (1<<4) #define M_RES2 (1 << 4)
#define RESFRC1 (1<<5) #define RESFRC1 (1 << 5)
#define RESFRC2 (1<<6) #define RESFRC2 (1 << 6)
/* WDTIM_EMR bit definitions */ /* WDTIM_EMR bit definitions */
#define EXT_MATCH0 1 #define EXT_MATCH0 1
#define MATCH_OUTPUT_HIGH (2<<4) /*a MATCH_CTRL setting */ #define MATCH_OUTPUT_HIGH (2 << 4) /*a MATCH_CTRL setting */
/* WDTIM_RES bit definitions */ /* WDTIM_RES bit definitions */
#define WDOG_RESET 1 /* read only */ #define WDOG_RESET 1 /* read only */
......
drivers/watchdog/rc32434_wdt.c
View file @ 8690d8a9
...@@ -17,27 +17,29 @@ ...@@ -17,27 +17,29 @@
* *
*/ */
#include <linux/module.h> #include <linux/module.h> /* For module specific items */
#include <linux/types.h> #include <linux/moduleparam.h> /* For new moduleparam's */
#include <linux/kernel.h> #include <linux/types.h> /* For standard types (like size_t) */
#include <linux/fs.h> #include <linux/errno.h> /* For the -ENODEV/... values */
#include <linux/mm.h> #include <linux/kernel.h> /* For printk/panic/... */
#include <linux/miscdevice.h> #include <linux/fs.h> /* For file operations */
#include <linux/watchdog.h> #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV
#include <linux/reboot.h> (WATCHDOG_MINOR) */
#include <linux/smp_lock.h> #include <linux/watchdog.h> /* For the watchdog specific items */
#include <linux/init.h> #include <linux/init.h> /* For __init/__exit/... */
#include <linux/platform_device.h> #include <linux/platform_device.h> /* For platform_driver framework */
#include <linux/uaccess.h> #include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */
#include <linux/uaccess.h> /* For copy_to_user/put_user/... */
#include <asm/bootinfo.h>
#include <asm/time.h> #include <asm/mach-rc32434/integ.h> /* For the Watchdog registers */
#include <asm/mach-rc32434/integ.h>
#define PFX KBUILD_MODNAME ": "
#define VERSION "0.4"
#define VERSION "1.0"
static struct { static struct {
unsigned long inuse; unsigned long inuse;
spinlock_t io_lock;
} rc32434_wdt_device; } rc32434_wdt_device;
static struct integ __iomem *wdt_reg; static struct integ __iomem *wdt_reg;
...@@ -58,6 +60,9 @@ extern unsigned int idt_cpu_freq; ...@@ -58,6 +60,9 @@ extern unsigned int idt_cpu_freq;
#define WATCHDOG_TIMEOUT 20 #define WATCHDOG_TIMEOUT 20
static int timeout = WATCHDOG_TIMEOUT; static int timeout = WATCHDOG_TIMEOUT;
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default="
WATCHDOG_TIMEOUT ")");
static int nowayout = WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
...@@ -68,10 +73,29 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" ...@@ -68,10 +73,29 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
#define SET_BITS(addr, or, nand) \ #define SET_BITS(addr, or, nand) \
writel((readl(&addr) | or) & ~nand, &addr) writel((readl(&addr) | or) & ~nand, &addr)
static int rc32434_wdt_set(int new_timeout)
{
int max_to = WTCOMP2SEC((u32)-1);
if (new_timeout < 0 || new_timeout > max_to) {
printk(KERN_ERR PFX "timeout value must be between 0 and %d",
max_to);
return -EINVAL;
}
timeout = new_timeout;
spin_lock(&rc32434_wdt_device.io_lock);
writel(SEC2WTCOMP(timeout), &wdt_reg->wtcompare);
spin_unlock(&rc32434_wdt_device.io_lock);
return 0;
}
static void rc32434_wdt_start(void) static void rc32434_wdt_start(void)
{ {
u32 or, nand; u32 or, nand;
spin_lock(&rc32434_wdt_device.io_lock);
/* zero the counter before enabling */ /* zero the counter before enabling */
writel(0, &wdt_reg->wtcount); writel(0, &wdt_reg->wtcount);
...@@ -85,38 +109,35 @@ static void rc32434_wdt_start(void) ...@@ -85,38 +109,35 @@ static void rc32434_wdt_start(void)
SET_BITS(wdt_reg->errcs, or, nand); SET_BITS(wdt_reg->errcs, or, nand);
/* set the timeout (either default or based on module param) */
rc32434_wdt_set(timeout);
/* reset WTC timeout bit and enable WDT */ /* reset WTC timeout bit and enable WDT */
nand = 1 << RC32434_WTC_TO; nand = 1 << RC32434_WTC_TO;
or = 1 << RC32434_WTC_EN; or = 1 << RC32434_WTC_EN;
SET_BITS(wdt_reg->wtc, or, nand); SET_BITS(wdt_reg->wtc, or, nand);
spin_unlock(&rc32434_wdt_device.io_lock);
printk(KERN_INFO PFX "Started watchdog timer.\n");
} }
static void rc32434_wdt_stop(void) static void rc32434_wdt_stop(void)
{ {
spin_lock(&rc32434_wdt_device.io_lock);
/* Disable WDT */ /* Disable WDT */
SET_BITS(wdt_reg->wtc, 0, 1 << RC32434_WTC_EN); SET_BITS(wdt_reg->wtc, 0, 1 << RC32434_WTC_EN);
}
static int rc32434_wdt_set(int new_timeout)
{
int max_to = WTCOMP2SEC((u32)-1);
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;
writel(SEC2WTCOMP(timeout), &wdt_reg->wtcompare);
return 0; spin_unlock(&rc32434_wdt_device.io_lock);
printk(KERN_INFO PFX "Stopped watchdog timer.\n");
} }
static void rc32434_wdt_ping(void) static void rc32434_wdt_ping(void)
{ {
spin_lock(&rc32434_wdt_device.io_lock);
writel(0, &wdt_reg->wtcount); writel(0, &wdt_reg->wtcount);
spin_unlock(&rc32434_wdt_device.io_lock);
} }
static int rc32434_wdt_open(struct inode *inode, struct file *file) static int rc32434_wdt_open(struct inode *inode, struct file *file)
...@@ -137,11 +158,10 @@ static int rc32434_wdt_release(struct inode *inode, struct file *file) ...@@ -137,11 +158,10 @@ static int rc32434_wdt_release(struct inode *inode, struct file *file)
{ {
if (expect_close == 42) { if (expect_close == 42) {
rc32434_wdt_stop(); rc32434_wdt_stop();
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 PFX
": device closed unexpectedly. WDT will not stop !\n"); "device closed unexpectedly. WDT will not stop!\n");
rc32434_wdt_ping(); rc32434_wdt_ping();
} }
clear_bit(0, &rc32434_wdt_device.inuse); clear_bit(0, &rc32434_wdt_device.inuse);
...@@ -185,8 +205,9 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -185,8 +205,9 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
.identity = "RC32434_WDT Watchdog", .identity = "RC32434_WDT Watchdog",
}; };
switch (cmd) { switch (cmd) {
case WDIOC_KEEPALIVE: case WDIOC_GETSUPPORT:
rc32434_wdt_ping(); if (copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT;
break; break;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
...@@ -194,10 +215,6 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -194,10 +215,6 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
if (copy_to_user(argp, &value, sizeof(int))) if (copy_to_user(argp, &value, sizeof(int)))
return -EFAULT; return -EFAULT;
break; break;
case WDIOC_GETSUPPORT:
if (copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT;
break;
case WDIOC_SETOPTIONS: case WDIOC_SETOPTIONS:
if (copy_from_user(&value, argp, sizeof(int))) if (copy_from_user(&value, argp, sizeof(int)))
return -EFAULT; return -EFAULT;
...@@ -212,6 +229,9 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -212,6 +229,9 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
return -EINVAL; return -EINVAL;
} }
break; break;
case WDIOC_KEEPALIVE:
rc32434_wdt_ping();
break;
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;
...@@ -227,7 +247,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd, ...@@ -227,7 +247,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
return 0; return 0;
} }
static struct file_operations rc32434_wdt_fops = { static const struct file_operations rc32434_wdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = rc32434_wdt_write, .write = rc32434_wdt_write,
...@@ -242,8 +262,8 @@ static struct miscdevice rc32434_wdt_miscdev = { ...@@ -242,8 +262,8 @@ static struct miscdevice rc32434_wdt_miscdev = {
.fops = &rc32434_wdt_fops, .fops = &rc32434_wdt_fops,
}; };
static char banner[] __devinitdata = KERN_INFO KBUILD_MODNAME static char banner[] __devinitdata = KERN_INFO PFX
": Watchdog Timer version " VERSION ", timer margin: %d sec\n"; "Watchdog Timer version " VERSION ", timer margin: %d sec\n";
static int __devinit rc32434_wdt_probe(struct platform_device *pdev) static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
{ {
...@@ -252,22 +272,33 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev) ...@@ -252,22 +272,33 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb532_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 PFX "failed to retrieve resources\n");
"failed to retrieve resources\n");
return -ENODEV; return -ENODEV;
} }
wdt_reg = ioremap_nocache(r->start, r->end - r->start); wdt_reg = ioremap_nocache(r->start, r->end - r->start);
if (!wdt_reg) { if (!wdt_reg) {
printk(KERN_ERR KBUILD_MODNAME printk(KERN_ERR PFX "failed to remap I/O resources\n");
"failed to remap I/O resources\n");
return -ENXIO; return -ENXIO;
} }
spin_lock_init(&rc32434_wdt_device.io_lock);
/* Make sure the watchdog is not running */
rc32434_wdt_stop();
/* Check that the heartbeat value is within it's range;
* if not reset to the default */
if (rc32434_wdt_set(timeout)) {
rc32434_wdt_set(WATCHDOG_TIMEOUT);
printk(KERN_INFO PFX
"timeout value must be between 0 and %d\n",
WTCOMP2SEC((u32)-1));
}
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 PFX "failed to register watchdog device\n");
"failed to register watchdog device\n");
goto unmap; goto unmap;
} }
...@@ -287,22 +318,28 @@ static int __devexit rc32434_wdt_remove(struct platform_device *pdev) ...@@ -287,22 +318,28 @@ static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct platform_driver rc32434_wdt = { static void rc32434_wdt_shutdown(struct platform_device *pdev)
.probe = rc32434_wdt_probe, {
.remove = __devexit_p(rc32434_wdt_remove), rc32434_wdt_stop();
.driver = { }
.name = "rc32434_wdt",
static struct platform_driver rc32434_wdt_driver = {
.probe = rc32434_wdt_probe,
.remove = __devexit_p(rc32434_wdt_remove),
.shutdown = rc32434_wdt_shutdown,
.driver = {
.name = "rc32434_wdt",
} }
}; };
static int __init rc32434_wdt_init(void) static int __init rc32434_wdt_init(void)
{ {
return platform_driver_register(&rc32434_wdt); return platform_driver_register(&rc32434_wdt_driver);
} }
static void __exit rc32434_wdt_exit(void) static void __exit rc32434_wdt_exit(void)
{ {
platform_driver_unregister(&rc32434_wdt); platform_driver_unregister(&rc32434_wdt_driver);
} }
module_init(rc32434_wdt_init); module_init(rc32434_wdt_init);
......
drivers/watchdog/riowd.c
View file @ 8690d8a9
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/io.h>
#include <asm/io.h> #include <linux/uaccess.h>
#include <asm/uaccess.h>
/* RIO uses the NatSemi Super I/O power management logical device /* RIO uses the NatSemi Super I/O power management logical device
...@@ -86,8 +85,7 @@ static int riowd_release(struct inode *inode, struct file *filp) ...@@ -86,8 +85,7 @@ static int riowd_release(struct inode *inode, struct file *filp)
return 0; return 0;
} }
static int riowd_ioctl(struct inode *inode, struct file *filp, static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
static struct watchdog_info info = { static struct watchdog_info info = {
.options = WDIOF_SETTIMEOUT, .options = WDIOF_SETTIMEOUT,
...@@ -147,7 +145,8 @@ static int riowd_ioctl(struct inode *inode, struct file *filp, ...@@ -147,7 +145,8 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,
return 0; return 0;
} }
static ssize_t riowd_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) static ssize_t riowd_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{ {
struct riowd *p = riowd_device; struct riowd *p = riowd_device;
...@@ -160,12 +159,12 @@ static ssize_t riowd_write(struct file *file, const char __user *buf, size_t cou ...@@ -160,12 +159,12 @@ static ssize_t riowd_write(struct file *file, const char __user *buf, size_t cou
} }
static const struct file_operations riowd_fops = { static const struct file_operations riowd_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.ioctl = riowd_ioctl, .unlocked_ioctl = riowd_ioctl,
.open = riowd_open, .open = riowd_open,
.write = riowd_write, .write = riowd_write,
.release = riowd_release, .release = riowd_release,
}; };
static struct miscdevice riowd_miscdev = { static struct miscdevice riowd_miscdev = {
......
drivers/watchdog/sa1100_wdt.c
View file @ 8690d8a9
/* /*
* Watchdog driver for the SA11x0/PXA2xx * Watchdog driver for the SA11x0/PXA2xx
* *
* (c) Copyright 2000 Oleg Drokin <green@crimea.edu> * (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
* Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk> * Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* (c) Copyright 2000 Oleg Drokin <green@crimea.edu> * (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
* *
* 27/11/2000 Initial release * 27/11/2000 Initial release
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
......
drivers/watchdog/sbc60xxwdt.c
View file @ 8690d8a9
/* /*
* 60xx Single Board Computer Watchdog Timer driver for Linux 2.2.x * 60xx Single Board Computer Watchdog Timer driver for Linux 2.2.x
* *
* Based on acquirewdt.c by Alan Cox. * Based on acquirewdt.c by Alan Cox.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
......
drivers/watchdog/sbc8360.c
View file @ 8690d8a9
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
* (c) Copyright 2005 Webcon, Inc. * (c) Copyright 2005 Webcon, Inc.
* *
* Based on ib700wdt.c, which is based on advantechwdt.c which is based * Based on ib700wdt.c, which is based on advantechwdt.c which is based
* on acquirewdt.c which is based on wdt.c. * on acquirewdt.c which is based on wdt.c.
* *
* (c) Copyright 2001 Charles Howes <chowes@vsol.net> * (c) Copyright 2001 Charles Howes <chowes@vsol.net>
* *
* Based on advantechwdt.c which is based on acquirewdt.c which * Based on advantechwdt.c which is based on acquirewdt.c which
* is based on wdt.c. * is based on wdt.c.
* *
* (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
* *
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
* *
* (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk> * (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk>
* *
* 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
* Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
* Added timeout module option to override default * Added timeout module option to override default
* *
*/ */
......
drivers/watchdog/sbc_epx_c3.c
View file @ 8690d8a9
...@@ -35,7 +35,8 @@ static int epx_c3_alive; ...@@ -35,7 +35,8 @@ static int epx_c3_alive;
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_STRING(WATCHDOG_NOWAYOUT) ")"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
#define EPXC3_WATCHDOG_CTL_REG 0x1ee /* write 1 to enable, 0 to disable */ #define EPXC3_WATCHDOG_CTL_REG 0x1ee /* write 1 to enable, 0 to disable */
#define EPXC3_WATCHDOG_PET_REG 0x1ef /* write anything to pet once enabled */ #define EPXC3_WATCHDOG_PET_REG 0x1ef /* write anything to pet once enabled */
......
drivers/watchdog/sc1200wdt.c
View file @ 8690d8a9
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
#define UART2_IRQ 0x04 /* Serial1 */ #define UART2_IRQ 0x04 /* Serial1 */
/* 5 -7 are reserved */ /* 5 -7 are reserved */
static char banner[] __initdata = KERN_INFO PFX SC1200_MODULE_VER; static char banner[] __initdata = PFX SC1200_MODULE_VER;
static int timeout = 1; static int timeout = 1;
static int io = -1; static int io = -1;
static int io_len = 2; /* for non plug and play */ static int io_len = 2; /* for non plug and play */
...@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void) ...@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void)
{ {
int ret; int ret;
printk("%s\n", banner); printk(KERN_INFO "%s\n", banner);
#if defined CONFIG_PNP #if defined CONFIG_PNP
if (isapnp) { if (isapnp) {
...@@ -477,6 +477,7 @@ module_init(sc1200wdt_init); ...@@ -477,6 +477,7 @@ module_init(sc1200wdt_init);
module_exit(sc1200wdt_exit); module_exit(sc1200wdt_exit);
MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>"); MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
MODULE_DESCRIPTION("Driver for National Semiconductor PC87307/PC97307 watchdog component"); MODULE_DESCRIPTION(
"Driver for National Semiconductor PC87307/PC97307 watchdog component");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
drivers/watchdog/sc520_wdt.c
View file @ 8690d8a9
/* /*
* AMD Elan SC520 processor Watchdog Timer driver * AMD Elan SC520 processor Watchdog Timer driver
* *
* Based on acquirewdt.c by Alan Cox, * Based on acquirewdt.c by Alan Cox,
* and sbc60xxwdt.c by Jakob Oestergaard <jakob@unthought.net> * and sbc60xxwdt.c by Jakob Oestergaard <jakob@unthought.net>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* The authors do NOT admit liability nor provide warranty for * The authors do NOT admit liability nor provide warranty for
* any of this software. This material is provided "AS-IS" in * any of this software. This material is provided "AS-IS" in
* the hope that it may be useful for others. * the hope that it may be useful for others.
* *
* (c) Copyright 2001 Scott Jennings <linuxdrivers@oro.net> * (c) Copyright 2001 Scott Jennings <linuxdrivers@oro.net>
* 9/27 - 2001 [Initial release] * 9/27 - 2001 [Initial release]
...@@ -438,6 +438,7 @@ module_init(sc520_wdt_init); ...@@ -438,6 +438,7 @@ module_init(sc520_wdt_init);
module_exit(sc520_wdt_unload); module_exit(sc520_wdt_unload);
MODULE_AUTHOR("Scott and Bill Jennings"); MODULE_AUTHOR("Scott and Bill Jennings");
MODULE_DESCRIPTION("Driver for watchdog timer in AMD \"Elan\" SC520 uProcessor"); MODULE_DESCRIPTION(
"Driver for watchdog timer in AMD \"Elan\" SC520 uProcessor");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
drivers/watchdog/smsc37b787_wdt.c
View file @ 8690d8a9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x * SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
* *
* Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk> * Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
* and some other existing drivers * and some other existing drivers
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* The authors do NOT admit liability nor provide warranty for * The authors do NOT admit liability nor provide warranty for
* any of this software. This material is provided "AS-IS" in * any of this software. This material is provided "AS-IS" in
* the hope that it may be useful for others. * the hope that it may be useful for others.
* *
* (C) Copyright 2003-2006 Sven Anders <anders@anduras.de> * (C) Copyright 2003-2006 Sven Anders <anders@anduras.de>
* *
...@@ -22,19 +22,19 @@ ...@@ -22,19 +22,19 @@
* *
* Theory of operation: * Theory of operation:
* *
* A Watchdog Timer (WDT) is a hardware circuit that can * A Watchdog Timer (WDT) is a hardware circuit that can
* reset the computer system in case of a software fault. * reset the computer system in case of a software fault.
* You probably knew that already. * You probably knew that already.
* *
* Usually a userspace daemon will notify the kernel WDT driver * Usually a userspace daemon will notify the kernel WDT driver
* via the /dev/watchdog special device file that userspace is * via the /dev/watchdog special device file that userspace is
* still alive, at regular intervals. When such a notification * still alive, at regular intervals. When such a notification
* occurs, the driver will usually tell the hardware watchdog * occurs, the driver will usually tell the hardware watchdog
* that everything is in order, and that the watchdog should wait * that everything is in order, and that the watchdog should wait
* for yet another little while to reset the system. * for yet another little while to reset the system.
* If userspace fails (RAM error, kernel bug, whatever), the * If userspace fails (RAM error, kernel bug, whatever), the
* notifications cease to occur, and the hardware watchdog will * notifications cease to occur, and the hardware watchdog will
* reset the system (causing a reboot) after the timeout occurs. * reset the system (causing a reboot) after the timeout occurs.
* *
* Create device with: * Create device with:
* mknod /dev/watchdog c 10 130 * mknod /dev/watchdog c 10 130
...@@ -485,7 +485,7 @@ static long wb_smsc_wdt_ioctl(struct file *file, ...@@ -485,7 +485,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
new_timeout = timeout; new_timeout = timeout;
if (unit == UNIT_MINUTE) if (unit == UNIT_MINUTE)
new_timeout *= 60; new_timeout *= 60;
return put_user(new_timeout, uarg.i); return put_user(new_timeout, uarg.i);
default: default:
return -ENOTTY; return -ENOTTY;
......
drivers/watchdog/softdog.c
View file @ 8690d8a9
/* /*
* SoftDog 0.07: A Software Watchdog Device * SoftDog 0.07: A Software Watchdog Device
* *
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, All Rights Reserved. * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
* All Rights Reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
* Added WDIOC_GETTIMEOUT and WDIOC_SETTIMOUT. * Added WDIOC_GETTIMEOUT and WDIOC_SETTIMOUT.
* *
* 20020530 Joel Becker <joel.becker@oracle.com> * 20020530 Joel Becker <joel.becker@oracle.com>
* Added Matt Domsch's nowayout module option. * Added Matt Domsch's nowayout module option.
*/ */
#include <linux/module.h> #include <linux/module.h>
......
drivers/watchdog/w83697hf_wdt.c
View file @ 8690d8a9
...@@ -462,6 +462,7 @@ module_init(wdt_init); ...@@ -462,6 +462,7 @@ module_init(wdt_init);
module_exit(wdt_exit); module_exit(wdt_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, Samuel Tardieu <sam@rfc1149.net>"); MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, "
"Samuel Tardieu <sam@rfc1149.net>");
MODULE_DESCRIPTION("w83697hf/hg WDT driver"); MODULE_DESCRIPTION("w83697hf/hg WDT driver");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
drivers/watchdog/w83697ug_wdt.c
View file @ 8690d8a9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* w83697ug/uf WDT driver * w83697ug/uf WDT driver
* *
* (c) Copyright 2008 Flemming Fransen <ff@nrvissing.net> * (c) Copyright 2008 Flemming Fransen <ff@nrvissing.net>
* reused original code to supoprt w83697ug/uf. * reused original code to support w83697ug/uf.
* *
* Based on w83627hf_wdt.c which is based on advantechwdt.c * Based on w83627hf_wdt.c which is based on advantechwdt.c
* which is based on wdt.c. * which is based on wdt.c.
...@@ -79,7 +79,7 @@ MODULE_PARM_DESC(nowayout, ...@@ -79,7 +79,7 @@ MODULE_PARM_DESC(nowayout,
(same as EFER) */ (same as EFER) */
#define WDT_EFDR (WDT_EFIR+1) /* Extended Function Data Register */ #define WDT_EFDR (WDT_EFIR+1) /* Extended Function Data Register */
static void w83697ug_select_wd_register(void) static int w83697ug_select_wd_register(void)
{ {
unsigned char c; unsigned char c;
unsigned char version; unsigned char version;
...@@ -102,7 +102,7 @@ static void w83697ug_select_wd_register(void) ...@@ -102,7 +102,7 @@ static void w83697ug_select_wd_register(void)
} else { } else {
printk(KERN_ERR PFX "No W83697UG/UF could be found\n"); printk(KERN_ERR PFX "No W83697UG/UF could be found\n");
return; return -ENODEV;
} }
outb_p(0x07, WDT_EFER); /* point to logical device number reg */ outb_p(0x07, WDT_EFER); /* point to logical device number reg */
...@@ -110,6 +110,8 @@ static void w83697ug_select_wd_register(void) ...@@ -110,6 +110,8 @@ static void w83697ug_select_wd_register(void)
outb_p(0x30, WDT_EFER); /* select CR30 */ outb_p(0x30, WDT_EFER); /* select CR30 */
c = inb_p(WDT_EFDR); c = inb_p(WDT_EFDR);
outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */ outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
return 0;
} }
static void w83697ug_unselect_wd_register(void) static void w83697ug_unselect_wd_register(void)
...@@ -117,11 +119,14 @@ static void w83697ug_unselect_wd_register(void) ...@@ -117,11 +119,14 @@ static void w83697ug_unselect_wd_register(void)
outb_p(0xAA, WDT_EFER); /* Leave extended function mode */ outb_p(0xAA, WDT_EFER); /* Leave extended function mode */
} }
static void w83697ug_init(void) static int w83697ug_init(void)
{ {
int ret;
unsigned char t; unsigned char t;
w83697ug_select_wd_register(); ret = w83697ug_select_wd_register();
if (ret != 0)
return ret;
outb_p(0xF6, WDT_EFER); /* Select CRF6 */ outb_p(0xF6, WDT_EFER); /* Select CRF6 */
t = inb_p(WDT_EFDR); /* read CRF6 */ t = inb_p(WDT_EFDR); /* read CRF6 */
...@@ -137,13 +142,15 @@ static void w83697ug_init(void) ...@@ -137,13 +142,15 @@ static void w83697ug_init(void)
outb_p(t, WDT_EFDR); /* Write back to CRF5 */ outb_p(t, WDT_EFDR); /* Write back to CRF5 */
w83697ug_unselect_wd_register(); w83697ug_unselect_wd_register();
return 0;
} }
static void wdt_ctrl(int timeout) static void wdt_ctrl(int timeout)
{ {
spin_lock(&io_lock); spin_lock(&io_lock);
w83697ug_select_wd_register(); if (w83697ug_select_wd_register() < 0)
return;
outb_p(0xF4, WDT_EFER); /* Select CRF4 */ outb_p(0xF4, WDT_EFER); /* Select CRF4 */
outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF4 */ outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF4 */
...@@ -347,7 +354,9 @@ static int __init wdt_init(void) ...@@ -347,7 +354,9 @@ static int __init wdt_init(void)
goto out; goto out;
} }
w83697ug_init(); ret = w83697ug_init();
if (ret != 0)
goto unreg_regions;
ret = register_reboot_notifier(&wdt_notifier); ret = register_reboot_notifier(&wdt_notifier);
if (ret != 0) { if (ret != 0) {
......
drivers/watchdog/w83977f_wdt.c
View file @ 8690d8a9
...@@ -426,7 +426,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -426,7 +426,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return -EFAULT; return -EFAULT;
if (wdt_set_timeout(new_timeout)) if (wdt_set_timeout(new_timeout))
return -EINVAL; return -EINVAL;
wdt_keepalive(); wdt_keepalive();
/* Fall */ /* Fall */
......
drivers/watchdog/wd501p.h
View file @ 8690d8a9
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
* *
* http://www.cymru.net * http://www.cymru.net
* *
* This driver is provided under the GNU General Public License, incorporated * This driver is provided under the GNU General Public License,
* herein by reference. The driver is provided without warranty or * incorporated herein by reference. The driver is provided without
* support. * warranty or support.
* *
* Release 0.04. * Release 0.04.
* *
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
/* programmable outputs: */ /* programmable outputs: */
#define WDT_PROGOUT (io+15) /* wr=enable, rd=disable */ #define WDT_PROGOUT (io+15) /* wr=enable, rd=disable */
/* FAN 501 500 */ /* FAN 501 500 */
#define WDC_SR_WCCR 1 /* Active low */ /* X X X */ #define WDC_SR_WCCR 1 /* Active low */ /* X X X */
#define WDC_SR_TGOOD 2 /* X X - */ #define WDC_SR_TGOOD 2 /* X X - */
#define WDC_SR_ISOI0 4 /* X X X */ #define WDC_SR_ISOI0 4 /* X X X */
#define WDC_SR_ISII1 8 /* X X X */ #define WDC_SR_ISII1 8 /* X X X */
#define WDC_SR_FANGOOD 16 /* X - - */ #define WDC_SR_FANGOOD 16 /* X - - */
#define WDC_SR_PSUOVER 32 /* Active low */ /* X X - */ #define WDC_SR_PSUOVER 32 /* Active low */ /* X X - */
#define WDC_SR_PSUUNDR 64 /* Active low */ /* X X - */ #define WDC_SR_PSUUNDR 64 /* Active low */ /* X X - */
#define WDC_SR_IRQ 128 /* Active low */ /* X X X */ #define WDC_SR_IRQ 128 /* Active low */ /* X X X */
drivers/watchdog/wdt.c
View file @ 8690d8a9
/* /*
* Industrial Computer Source WDT500/501 driver * Industrial Computer Source WDT501 driver
* *
* (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>, * (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
* All Rights Reserved. * All Rights Reserved.
...@@ -82,14 +82,16 @@ MODULE_PARM_DESC(io, "WDT io port (default=0x240)"); ...@@ -82,14 +82,16 @@ MODULE_PARM_DESC(io, "WDT io port (default=0x240)");
module_param(irq, int, 0); module_param(irq, int, 0);
MODULE_PARM_DESC(irq, "WDT irq (default=11)"); MODULE_PARM_DESC(irq, "WDT irq (default=11)");
#ifdef CONFIG_WDT_501
/* Support for the Fan Tachometer on the WDT501-P */ /* Support for the Fan Tachometer on the WDT501-P */
static int tachometer; static int tachometer;
module_param(tachometer, int, 0); module_param(tachometer, int, 0);
MODULE_PARM_DESC(tachometer, MODULE_PARM_DESC(tachometer,
"WDT501-P Fan Tachometer support (0=disable, default=0)"); "WDT501-P Fan Tachometer support (0=disable, default=0)");
#endif /* CONFIG_WDT_501 */
static int type = 500;
module_param(type, int, 0);
MODULE_PARM_DESC(type,
"WDT501-P Card type (500 or 501 , default=500)");
/* /*
* Programming support * Programming support
...@@ -158,7 +160,7 @@ static int wdt_stop(void) ...@@ -158,7 +160,7 @@ static int wdt_stop(void)
* reloading the cascade counter. * reloading the cascade counter.
*/ */
static int wdt_ping(void) static void wdt_ping(void)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&wdt_lock, flags); spin_lock_irqsave(&wdt_lock, flags);
...@@ -169,7 +171,6 @@ static int wdt_ping(void) ...@@ -169,7 +171,6 @@ static int wdt_ping(void)
wdt_ctr_load(1, wd_heartbeat); /* Heartbeat */ wdt_ctr_load(1, wd_heartbeat); /* Heartbeat */
outb_p(0, WDT_DC); /* Enable watchdog */ outb_p(0, WDT_DC); /* Enable watchdog */
spin_unlock_irqrestore(&wdt_lock, flags); spin_unlock_irqrestore(&wdt_lock, flags);
return 0;
} }
/** /**
...@@ -193,7 +194,6 @@ static int wdt_set_heartbeat(int t) ...@@ -193,7 +194,6 @@ static int wdt_set_heartbeat(int t)
/** /**
* wdt_get_status: * wdt_get_status:
* @status: the new status.
* *
* Extract the status information from a WDT watchdog device. There are * Extract the status information from a WDT watchdog device. There are
* several board variants so we have to know which bits are valid. Some * several board variants so we have to know which bits are valid. Some
...@@ -202,36 +202,35 @@ static int wdt_set_heartbeat(int t) ...@@ -202,36 +202,35 @@ static int wdt_set_heartbeat(int t)
* we then map the bits onto the status ioctl flags. * we then map the bits onto the status ioctl flags.
*/ */
static int wdt_get_status(int *status) static int wdt_get_status(void)
{ {
unsigned char new_status; unsigned char new_status;
int status = 0;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&wdt_lock, flags); spin_lock_irqsave(&wdt_lock, flags);
new_status = inb_p(WDT_SR); new_status = inb_p(WDT_SR);
spin_unlock_irqrestore(&wdt_lock, flags); spin_unlock_irqrestore(&wdt_lock, flags);
*status = 0;
if (new_status & WDC_SR_ISOI0) if (new_status & WDC_SR_ISOI0)
*status |= WDIOF_EXTERN1; status |= WDIOF_EXTERN1;
if (new_status & WDC_SR_ISII1) if (new_status & WDC_SR_ISII1)
*status |= WDIOF_EXTERN2; status |= WDIOF_EXTERN2;
#ifdef CONFIG_WDT_501 if (type == 501) {
if (!(new_status & WDC_SR_TGOOD)) if (!(new_status & WDC_SR_TGOOD))
*status |= WDIOF_OVERHEAT; status |= WDIOF_OVERHEAT;
if (!(new_status & WDC_SR_PSUOVER)) if (!(new_status & WDC_SR_PSUOVER))
*status |= WDIOF_POWEROVER; status |= WDIOF_POWEROVER;
if (!(new_status & WDC_SR_PSUUNDR)) if (!(new_status & WDC_SR_PSUUNDR))
*status |= WDIOF_POWERUNDER; status |= WDIOF_POWERUNDER;
if (tachometer) { if (tachometer) {
if (!(new_status & WDC_SR_FANGOOD)) if (!(new_status & WDC_SR_FANGOOD))
*status |= WDIOF_FANFAULT; status |= WDIOF_FANFAULT;
}
} }
#endif /* CONFIG_WDT_501 */ return status;
return 0;
} }
#ifdef CONFIG_WDT_501
/** /**
* wdt_get_temperature: * wdt_get_temperature:
* *
...@@ -239,7 +238,7 @@ static int wdt_get_status(int *status) ...@@ -239,7 +238,7 @@ static int wdt_get_status(int *status)
* farenheit. It was designed by an imperial measurement luddite. * farenheit. It was designed by an imperial measurement luddite.
*/ */
static int wdt_get_temperature(int *temperature) static int wdt_get_temperature(void)
{ {
unsigned short c; unsigned short c;
unsigned long flags; unsigned long flags;
...@@ -247,10 +246,18 @@ static int wdt_get_temperature(int *temperature) ...@@ -247,10 +246,18 @@ static int wdt_get_temperature(int *temperature)
spin_lock_irqsave(&wdt_lock, flags); spin_lock_irqsave(&wdt_lock, flags);
c = inb_p(WDT_RT); c = inb_p(WDT_RT);
spin_unlock_irqrestore(&wdt_lock, flags); spin_unlock_irqrestore(&wdt_lock, flags);
*temperature = (c * 11 / 15) + 7; return (c * 11 / 15) + 7;
return 0; }
static void wdt_decode_501(int status)
{
if (!(status & WDC_SR_TGOOD))
printk(KERN_CRIT "Overheat alarm.(%d)\n", inb_p(WDT_RT));
if (!(status & WDC_SR_PSUOVER))
printk(KERN_CRIT "PSU over voltage.\n");
if (!(status & WDC_SR_PSUUNDR))
printk(KERN_CRIT "PSU under voltage.\n");
} }
#endif /* CONFIG_WDT_501 */
/** /**
* wdt_interrupt: * wdt_interrupt:
...@@ -275,18 +282,13 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id) ...@@ -275,18 +282,13 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
printk(KERN_CRIT "WDT status %d\n", status); printk(KERN_CRIT "WDT status %d\n", status);
#ifdef CONFIG_WDT_501 if (type == 501) {
if (!(status & WDC_SR_TGOOD)) wdt_decode_501(status);
printk(KERN_CRIT "Overheat alarm.(%d)\n", inb_p(WDT_RT)); if (tachometer) {
if (!(status & WDC_SR_PSUOVER)) if (!(status & WDC_SR_FANGOOD))
printk(KERN_CRIT "PSU over voltage.\n"); printk(KERN_CRIT "Possible fan fault.\n");
if (!(status & WDC_SR_PSUUNDR)) }
printk(KERN_CRIT "PSU under voltage.\n");
if (tachometer) {
if (!(status & WDC_SR_FANGOOD))
printk(KERN_CRIT "Possible fan fault.\n");
} }
#endif /* CONFIG_WDT_501 */
if (!(status & WDC_SR_WCCR)) { if (!(status & WDC_SR_WCCR)) {
#ifdef SOFTWARE_REBOOT #ifdef SOFTWARE_REBOOT
#ifdef ONLY_TESTING #ifdef ONLY_TESTING
...@@ -366,17 +368,18 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -366,17 +368,18 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
/* Add options according to the card we have */ /* Add options according to the card we have */
ident.options |= (WDIOF_EXTERN1|WDIOF_EXTERN2); ident.options |= (WDIOF_EXTERN1|WDIOF_EXTERN2);
#ifdef CONFIG_WDT_501 if (type == 501) {
ident.options |= (WDIOF_OVERHEAT|WDIOF_POWERUNDER|WDIOF_POWEROVER); ident.options |= (WDIOF_OVERHEAT|WDIOF_POWERUNDER|
if (tachometer) WDIOF_POWEROVER);
ident.options |= WDIOF_FANFAULT; if (tachometer)
#endif /* CONFIG_WDT_501 */ ident.options |= WDIOF_FANFAULT;
}
switch (cmd) { switch (cmd) {
case WDIOC_GETSUPPORT: case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0; return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
wdt_get_status(&status); status = wdt_get_status();
return put_user(status, p); return put_user(status, p);
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
return put_user(0, p); return put_user(0, p);
...@@ -446,7 +449,6 @@ static int wdt_release(struct inode *inode, struct file *file) ...@@ -446,7 +449,6 @@ static int wdt_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
#ifdef CONFIG_WDT_501
/** /**
* wdt_temp_read: * wdt_temp_read:
* @file: file handle to the watchdog board * @file: file handle to the watchdog board
...@@ -461,10 +463,7 @@ static int wdt_release(struct inode *inode, struct file *file) ...@@ -461,10 +463,7 @@ static int wdt_release(struct inode *inode, struct file *file)
static ssize_t wdt_temp_read(struct file *file, char __user *buf, static ssize_t wdt_temp_read(struct file *file, char __user *buf,
size_t count, loff_t *ptr) size_t count, loff_t *ptr)
{ {
int temperature; int temperature = wdt_get_temperature();
if (wdt_get_temperature(&temperature))
return -EFAULT;
if (copy_to_user(buf, &temperature, 1)) if (copy_to_user(buf, &temperature, 1))
return -EFAULT; return -EFAULT;
...@@ -497,7 +496,6 @@ static int wdt_temp_release(struct inode *inode, struct file *file) ...@@ -497,7 +496,6 @@ static int wdt_temp_release(struct inode *inode, struct file *file)
{ {
return 0; return 0;
} }
#endif /* CONFIG_WDT_501 */
/** /**
* notify_sys: * notify_sys:
...@@ -539,7 +537,6 @@ static struct miscdevice wdt_miscdev = { ...@@ -539,7 +537,6 @@ static struct miscdevice wdt_miscdev = {
.fops = &wdt_fops, .fops = &wdt_fops,
}; };
#ifdef CONFIG_WDT_501
static const struct file_operations wdt_temp_fops = { static const struct file_operations wdt_temp_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
...@@ -553,7 +550,6 @@ static struct miscdevice temp_miscdev = { ...@@ -553,7 +550,6 @@ static struct miscdevice temp_miscdev = {
.name = "temperature", .name = "temperature",
.fops = &wdt_temp_fops, .fops = &wdt_temp_fops,
}; };
#endif /* CONFIG_WDT_501 */
/* /*
* The WDT card needs to learn about soft shutdowns in order to * The WDT card needs to learn about soft shutdowns in order to
...@@ -577,9 +573,8 @@ static struct notifier_block wdt_notifier = { ...@@ -577,9 +573,8 @@ static struct notifier_block wdt_notifier = {
static void __exit wdt_exit(void) static void __exit wdt_exit(void)
{ {
misc_deregister(&wdt_miscdev); misc_deregister(&wdt_miscdev);
#ifdef CONFIG_WDT_501 if (type == 501)
misc_deregister(&temp_miscdev); misc_deregister(&temp_miscdev);
#endif /* CONFIG_WDT_501 */
unregister_reboot_notifier(&wdt_notifier); unregister_reboot_notifier(&wdt_notifier);
free_irq(irq, NULL); free_irq(irq, NULL);
release_region(io, 8); release_region(io, 8);
...@@ -597,12 +592,17 @@ static int __init wdt_init(void) ...@@ -597,12 +592,17 @@ static int __init wdt_init(void)
{ {
int ret; int ret;
if (type != 500 && type != 501) {
printk(KERN_ERR "wdt: unknown card type '%d'.\n", type);
return -ENODEV;
}
/* Check that the heartbeat value is within it's range; /* Check that the heartbeat value is within it's range;
if not reset to the default */ if not reset to the default */
if (wdt_set_heartbeat(heartbeat)) { if (wdt_set_heartbeat(heartbeat)) {
wdt_set_heartbeat(WD_TIMO); wdt_set_heartbeat(WD_TIMO);
printk(KERN_INFO "wdt: heartbeat value must be 0 < heartbeat < 65536, using %d\n", printk(KERN_INFO "wdt: heartbeat value must be "
WD_TIMO); "0 < heartbeat < 65536, using %d\n", WD_TIMO);
} }
if (!request_region(io, 8, "wdt501p")) { if (!request_region(io, 8, "wdt501p")) {
...@@ -625,15 +625,14 @@ static int __init wdt_init(void) ...@@ -625,15 +625,14 @@ static int __init wdt_init(void)
goto outirq; goto outirq;
} }
#ifdef CONFIG_WDT_501 if (type == 501) {
ret = misc_register(&temp_miscdev); ret = misc_register(&temp_miscdev);
if (ret) { if (ret) {
printk(KERN_ERR printk(KERN_ERR "wdt: cannot register miscdev "
"wdt: cannot register miscdev on minor=%d (err=%d)\n", "on minor=%d (err=%d)\n", TEMP_MINOR, ret);
TEMP_MINOR, ret); goto outrbt;
goto outrbt; }
} }
#endif /* CONFIG_WDT_501 */
ret = misc_register(&wdt_miscdev); ret = misc_register(&wdt_miscdev);
if (ret) { if (ret) {
...@@ -643,28 +642,25 @@ static int __init wdt_init(void) ...@@ -643,28 +642,25 @@ static int __init wdt_init(void)
goto outmisc; goto outmisc;
} }
ret = 0; printk(KERN_INFO "WDT500/501-P driver 0.10 "
printk(KERN_INFO "WDT500/501-P driver 0.10 at 0x%04x (Interrupt %d). heartbeat=%d sec (nowayout=%d)\n", "at 0x%04x (Interrupt %d). heartbeat=%d sec (nowayout=%d)\n",
io, irq, heartbeat, nowayout); io, irq, heartbeat, nowayout);
#ifdef CONFIG_WDT_501 if (type == 501)
printk(KERN_INFO "wdt: Fan Tachometer is %s\n", printk(KERN_INFO "wdt: Fan Tachometer is %s\n",
(tachometer ? "Enabled" : "Disabled")); (tachometer ? "Enabled" : "Disabled"));
#endif /* CONFIG_WDT_501 */ return 0;
out:
return ret;
outmisc: outmisc:
#ifdef CONFIG_WDT_501 if (type == 501)
misc_deregister(&temp_miscdev); misc_deregister(&temp_miscdev);
outrbt: outrbt:
#endif /* CONFIG_WDT_501 */
unregister_reboot_notifier(&wdt_notifier); unregister_reboot_notifier(&wdt_notifier);
outirq: outirq:
free_irq(irq, NULL); free_irq(irq, NULL);
outreg: outreg:
release_region(io, 8); release_region(io, 8);
goto out; out:
return ret;
} }
module_init(wdt_init); module_init(wdt_init);
......
drivers/watchdog/wdt977.c
View file @ 8690d8a9
...@@ -401,7 +401,7 @@ static long wdt977_ioctl(struct file *file, unsigned int cmd, ...@@ -401,7 +401,7 @@ static long wdt977_ioctl(struct file *file, unsigned int cmd,
return -EFAULT; return -EFAULT;
if (wdt977_set_timeout(new_timeout)) if (wdt977_set_timeout(new_timeout))
return -EINVAL; return -EINVAL;
wdt977_keepalive(); wdt977_keepalive();
/* Fall */ /* Fall */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7