microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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
This commit is contained in:
Linus Torvalds 2009-03-26 15:48:11 -07:00
Родитель d3f12d36f1 3b9d49eea1
Коммит 8690d8a9f6
42 изменённых файлов: 788 добавлений и 531 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
arch/arm/mach-orion5x/common.c
Просмотреть файл

@ -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)
} }
/*****************************************************************************
* 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)
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();
} }
/* /*

18
arch/arm/plat-orion/include/plat/orion5x_wdt.h Normal file
Просмотреть файл

@ -0,0 +1,18 @@
/*
* 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

15
drivers/watchdog/Kconfig
Просмотреть файл

@ -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
# #

7
drivers/watchdog/advantechwdt.c
Просмотреть файл

@ -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)
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

6
drivers/watchdog/alim7101_wdt.c
Просмотреть файл

@ -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)
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;
} }

21
drivers/watchdog/cpwd.c
Просмотреть файл

@ -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"
@ -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.
@ -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)
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)
@ -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,
.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;
@ -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,
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;
@ -516,7 +517,7 @@ static ssize_t cpwd_read(struct file * file, char __user *buffer,
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,

45
drivers/watchdog/davinci_wdt.c
Просмотреть файл

@ -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)
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)
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)
{ {
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)
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;
} }

11
drivers/watchdog/geodewdt.c
Просмотреть файл

@ -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)
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;

20
drivers/watchdog/hpwdt.c
Просмотреть файл

@ -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;
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,
/* /*
* 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,
} }
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)
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);

101
drivers/watchdog/i6300esb.c
Просмотреть файл

@ -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 @@
#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 @@
#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;
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)
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)
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,
* 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)
} }
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)
} }
} }
/*
* 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 = {
.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);
* 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 @@ err_devput:
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)
"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)
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 @@ err_unmap:
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)
/* 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);

6
drivers/watchdog/iTCO_vendor_support.c
Просмотреть файл

@ -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)
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");

15
drivers/watchdog/iTCO_wdt.c
Просмотреть файл

@ -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)
/* 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,
/* 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,
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);

78
drivers/watchdog/orion5x_wdt.c
Просмотреть файл

@ -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 @@
#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)
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)
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,
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 = {
.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;
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);
if (ret)
return ret;
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; int ret;
spin_lock_init(&wdt_lock); if (test_bit(WDT_IN_USE, &wdt_status)) {
wdt_disable();
clear_bit(WDT_IN_USE, &wdt_status);
}
ret = misc_register(&orion5x_wdt_miscdev); ret = misc_deregister(&orion5x_wdt_miscdev);
if (ret == 0) if (!ret)
printk("Orion5x Watchdog Timer: heartbeat %d sec\n", orion5x_wdt_miscdev.parent = NULL;
heartbeat);
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>");
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");

6
drivers/watchdog/pc87413_wdt.c
Просмотреть файл

@ -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)
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");

24
drivers/watchdog/pcwd.c
Просмотреть файл

@ -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,
#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)
} }
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)
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)
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)
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)
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");

106
drivers/watchdog/pcwd_pci.c
Просмотреть файл

@ -24,7 +24,8 @@
* A bells and whistles driver is available from: * A bells and whistles driver is available from:
* http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/ * http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/
* *
* More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/ * More info available at
* http://www.berkprod.com/ or http://www.pcwatchdog.com/
*/ */
/* /*
@ -51,11 +52,10 @@
/* Module and version information */ /* Module and version information */
#define WATCHDOG_VERSION "1.03" #define WATCHDOG_VERSION "1.03"
#define WATCHDOG_DATE "21 Jan 2007"
#define WATCHDOG_DRIVER_NAME "PCI-PC Watchdog" #define WATCHDOG_DRIVER_NAME "PCI-PC Watchdog"
#define WATCHDOG_NAME "pcwd_pci" #define WATCHDOG_NAME "pcwd_pci"
#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"
/* Stuff for the PCI ID's */ /* Stuff for the PCI ID's */
#ifndef PCI_VENDOR_ID_QUICKLOGIC #ifndef PCI_VENDOR_ID_QUICKLOGIC
@ -76,7 +76,8 @@
#define WD_PCI_TTRP 0x04 /* Temperature Trip status */ #define WD_PCI_TTRP 0x04 /* Temperature Trip status */
#define WD_PCI_RL2A 0x08 /* Relay 2 Active */ #define WD_PCI_RL2A 0x08 /* Relay 2 Active */
#define WD_PCI_RL1A 0x10 /* Relay 1 Active */ #define WD_PCI_RL1A 0x10 /* Relay 1 Active */
#define WD_PCI_R2DS 0x40 /* Relay 2 Disable Temperature-trip/reset */ #define WD_PCI_R2DS 0x40 /* Relay 2 Disable Temperature-trip /
reset */
#define WD_PCI_RLY2 0x80 /* Activate Relay 2 on the board */ #define WD_PCI_RLY2 0x80 /* Activate Relay 2 on the board */
/* Port 2 : Control Status #2 */ /* Port 2 : Control Status #2 */
#define WD_PCI_WDIS 0x10 /* Watchdog Disable */ #define WD_PCI_WDIS 0x10 /* Watchdog Disable */
@ -114,12 +115,18 @@ static int cards_found;
static int temp_panic; static int temp_panic;
static unsigned long is_active; static unsigned long is_active;
static char expect_release; static char expect_release;
static struct { /* this is private data for each PCI-PC watchdog card */ /* this is private data for each PCI-PC watchdog card */
int supports_temp; /* Wether or not the card has a temperature device */ static struct {
int boot_status; /* The card's boot status */ /* Wether or not the card has a temperature device */
unsigned long io_addr; /* The cards I/O address */ int supports_temp;
spinlock_t io_lock; /* the lock for io operations */ /* The card's boot status */
struct pci_dev *pdev; /* the PCI-device */ int boot_status;
/* The cards I/O address */
unsigned long io_addr;
/* the lock for io operations */
spinlock_t io_lock;
/* the PCI-device */
struct pci_dev *pdev;
} pcipcwd_private; } pcipcwd_private;
/* module parameters */ /* module parameters */
@ -130,14 +137,18 @@ static int debug = QUIET;
module_param(debug, int, 0); module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "Debug level: 0=Quiet, 1=Verbose, 2=Debug (default=0)"); MODULE_PARM_DESC(debug, "Debug level: 0=Quiet, 1=Verbose, 2=Debug (default=0)");
#define WATCHDOG_HEARTBEAT 0 /* default heartbeat = delay-time from dip-switches */ #define WATCHDOG_HEARTBEAT 0 /* default heartbeat =
delay-time from dip-switches */
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. (0<heartbeat<65536 or 0=delay-time from dip-switches, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
"(0<heartbeat<65536 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);
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) ")");
/* /*
* Internal functions * Internal functions
@ -148,8 +159,8 @@ static int send_command(int cmd, int *msb, int *lsb)
int got_response, count; int got_response, count;
if (debug >= DEBUG) if (debug >= DEBUG)
printk(KERN_DEBUG PFX "sending following data cmd=0x%02x msb=0x%02x lsb=0x%02x\n", printk(KERN_DEBUG PFX "sending following data "
cmd, *msb, *lsb); "cmd=0x%02x msb=0x%02x lsb=0x%02x\n", cmd, *msb, *lsb);
spin_lock(&pcipcwd_private.io_lock); spin_lock(&pcipcwd_private.io_lock);
/* If a command requires data it should be written first. /* If a command requires data it should be written first.
@ -166,17 +177,20 @@ static int send_command(int cmd, int *msb, int *lsb)
* the WRSP bit in port 2 and give it a max. timeout of * the WRSP bit in port 2 and give it a max. timeout of
* PCI_COMMAND_TIMEOUT to process */ * PCI_COMMAND_TIMEOUT to process */
got_response = inb_p(pcipcwd_private.io_addr + 2) & WD_PCI_WRSP; got_response = inb_p(pcipcwd_private.io_addr + 2) & WD_PCI_WRSP;
for (count = 0; (count < PCI_COMMAND_TIMEOUT) && (!got_response); count++) { for (count = 0; (count < PCI_COMMAND_TIMEOUT) && (!got_response);
count++) {
mdelay(1); mdelay(1);
got_response = inb_p(pcipcwd_private.io_addr + 2) & WD_PCI_WRSP; got_response = inb_p(pcipcwd_private.io_addr + 2) & WD_PCI_WRSP;
} }
if (debug >= DEBUG) { if (debug >= DEBUG) {
if (got_response) { if (got_response) {
printk(KERN_DEBUG PFX "time to process command was: %d ms\n", printk(KERN_DEBUG PFX
"time to process command was: %d ms\n",
count); count);
} else { } else {
printk(KERN_DEBUG PFX "card did not respond on command!\n"); printk(KERN_DEBUG PFX
"card did not respond on command!\n");
} }
} }
@ -189,7 +203,8 @@ static int send_command(int cmd, int *msb, int *lsb)
inb_p(pcipcwd_private.io_addr + 6); inb_p(pcipcwd_private.io_addr + 6);
if (debug >= DEBUG) if (debug >= DEBUG)
printk(KERN_DEBUG PFX "received following data for cmd=0x%02x: msb=0x%02x lsb=0x%02x\n", printk(KERN_DEBUG PFX "received following data for "
"cmd=0x%02x: msb=0x%02x lsb=0x%02x\n",
cmd, *msb, *lsb); cmd, *msb, *lsb);
} }
@ -218,7 +233,8 @@ static void pcipcwd_show_card_info(void)
char fw_ver_str[20]; /* The cards firmware version */ char fw_ver_str[20]; /* The cards firmware version */
int option_switches; int option_switches;
got_fw_rev = send_command(CMD_GET_FIRMWARE_VERSION, &fw_rev_major, &fw_rev_minor); got_fw_rev = send_command(CMD_GET_FIRMWARE_VERSION, &fw_rev_major,
&fw_rev_minor);
if (got_fw_rev) if (got_fw_rev)
sprintf(fw_ver_str, "%u.%02u", fw_rev_major, fw_rev_minor); sprintf(fw_ver_str, "%u.%02u", fw_rev_major, fw_rev_minor);
else else
@ -227,23 +243,27 @@ static void pcipcwd_show_card_info(void)
/* Get switch settings */ /* Get switch settings */
option_switches = pcipcwd_get_option_switches(); option_switches = pcipcwd_get_option_switches();
printk(KERN_INFO PFX "Found card at port 0x%04x (Firmware: %s) %s temp option\n", printk(KERN_INFO PFX "Found card at port "
"0x%04x (Firmware: %s) %s temp option\n",
(int) pcipcwd_private.io_addr, fw_ver_str, (int) pcipcwd_private.io_addr, fw_ver_str,
(pcipcwd_private.supports_temp ? "with" : "without")); (pcipcwd_private.supports_temp ? "with" : "without"));
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"));
if (pcipcwd_private.boot_status & WDIOF_CARDRESET) if (pcipcwd_private.boot_status & WDIOF_CARDRESET)
printk(KERN_INFO PFX "Previous reset was caused by the Watchdog card\n"); printk(KERN_INFO PFX
"Previous reset was caused by the Watchdog card\n");
if (pcipcwd_private.boot_status & WDIOF_OVERHEAT) if (pcipcwd_private.boot_status & WDIOF_OVERHEAT)
printk(KERN_INFO PFX "Card sensed a CPU Overheat\n"); printk(KERN_INFO PFX "Card sensed a CPU Overheat\n");
if (pcipcwd_private.boot_status == 0) if (pcipcwd_private.boot_status == 0)
printk(KERN_INFO PFX "No previous trip detected - Cold boot or reset\n"); printk(KERN_INFO PFX
"No previous trip detected - Cold boot or reset\n");
} }
static int pcipcwd_start(void) static int pcipcwd_start(void)
@ -283,7 +303,8 @@ static int pcipcwd_stop(void)
spin_unlock(&pcipcwd_private.io_lock); spin_unlock(&pcipcwd_private.io_lock);
if (!(stat_reg & WD_PCI_WDIS)) { if (!(stat_reg & WD_PCI_WDIS)) {
printk(KERN_ERR PFX "Card did not acknowledge disable attempt\n"); printk(KERN_ERR PFX
"Card did not acknowledge disable attempt\n");
return -1; return -1;
} }
@ -364,7 +385,8 @@ static int pcipcwd_clear_status(void)
} }
/* clear trip status & LED and keep mode of relay 2 */ /* clear trip status & LED and keep mode of relay 2 */
outb_p((control_status & WD_PCI_R2DS) | WD_PCI_WTRP, pcipcwd_private.io_addr + 1); outb_p((control_status & WD_PCI_R2DS) | WD_PCI_WTRP,
pcipcwd_private.io_addr + 1);
/* clear reset counter */ /* clear reset counter */
msb = 0; msb = 0;
@ -437,7 +459,8 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data,
* five months ago... */ * five months ago... */
expect_release = 0; expect_release = 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))
@ -560,7 +583,8 @@ static int pcipcwd_open(struct inode *inode, struct file *file)
/* /dev/watchdog can only be opened once */ /* /dev/watchdog can only be opened once */
if (test_and_set_bit(0, &is_active)) { if (test_and_set_bit(0, &is_active)) {
if (debug >= VERBOSE) if (debug >= VERBOSE)
printk(KERN_ERR PFX "Attempt to open already opened device.\n"); printk(KERN_ERR PFX
"Attempt to open already opened device.\n");
return -EBUSY; return -EBUSY;
} }
@ -578,7 +602,8 @@ static int pcipcwd_release(struct inode *inode, struct file *file)
if (expect_release == 42) { if (expect_release == 42) {
pcipcwd_stop(); pcipcwd_stop();
} else { } else {
printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); printk(KERN_CRIT PFX
"Unexpected close, not stopping watchdog!\n");
pcipcwd_keepalive(); pcipcwd_keepalive();
} }
expect_release = 0; expect_release = 0;
@ -621,7 +646,8 @@ static int pcipcwd_temp_release(struct inode *inode, struct file *file)
* Notify system * Notify system
*/ */
static int pcipcwd_notify_sys(struct notifier_block *this, unsigned long code, void *unused) static int pcipcwd_notify_sys(struct notifier_block *this, unsigned long code,
void *unused)
{ {
if (code == SYS_DOWN || code == SYS_HALT) if (code == SYS_DOWN || code == SYS_HALT)
pcipcwd_stop(); /* Turn the WDT off */ pcipcwd_stop(); /* Turn the WDT off */
@ -722,34 +748,38 @@ static int __devinit pcipcwd_card_init(struct pci_dev *pdev,
/* If heartbeat = 0 then we use the heartbeat from the dip-switches */ /* If heartbeat = 0 then we use the heartbeat from the dip-switches */
if (heartbeat == 0) if (heartbeat == 0)
heartbeat = heartbeat_tbl[(pcipcwd_get_option_switches() & 0x07)]; heartbeat =
heartbeat_tbl[(pcipcwd_get_option_switches() & 0x07)];
/* 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 (pcipcwd_set_heartbeat(heartbeat)) { if (pcipcwd_set_heartbeat(heartbeat)) {
pcipcwd_set_heartbeat(WATCHDOG_HEARTBEAT); pcipcwd_set_heartbeat(WATCHDOG_HEARTBEAT);
printk(KERN_INFO PFX "heartbeat value must be 0<heartbeat<65536, using %d\n", printk(KERN_INFO PFX
"heartbeat value must be 0<heartbeat<65536, using %d\n",
WATCHDOG_HEARTBEAT); WATCHDOG_HEARTBEAT);
} }
ret = register_reboot_notifier(&pcipcwd_notifier); ret = register_reboot_notifier(&pcipcwd_notifier);
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", printk(KERN_ERR PFX
ret); "cannot register reboot notifier (err=%d)\n", ret);
goto err_out_release_region; goto err_out_release_region;
} }
if (pcipcwd_private.supports_temp) { if (pcipcwd_private.supports_temp) {
ret = misc_register(&pcipcwd_temp_miscdev); ret = misc_register(&pcipcwd_temp_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 "
TEMP_MINOR, ret); "minor=%d (err=%d)\n", TEMP_MINOR, ret);
goto err_out_unregister_reboot; goto err_out_unregister_reboot;
} }
} }
ret = misc_register(&pcipcwd_miscdev); ret = misc_register(&pcipcwd_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);
goto err_out_misc_deregister; goto err_out_misc_deregister;
} }

159
drivers/watchdog/pcwd_usb.c
Просмотреть файл

@ -51,12 +51,11 @@
/* Use our own dbg macro */ /* Use our own dbg macro */
#undef dbg #undef dbg
#define dbg(format, arg...) do { if (debug) printk(KERN_DEBUG PFX format "\n" , ## arg); } while (0) #define dbg(format, arg...) \
do { if (debug) printk(KERN_DEBUG PFX format "\n" , ## arg); } while (0)
/* Module and Version Information */ /* Module and Version Information */
#define DRIVER_VERSION "1.02" #define DRIVER_VERSION "1.02"
#define DRIVER_DATE "21 Jan 2007"
#define DRIVER_AUTHOR "Wim Van Sebroeck <wim@iguana.be>" #define DRIVER_AUTHOR "Wim Van Sebroeck <wim@iguana.be>"
#define DRIVER_DESC "Berkshire USB-PC Watchdog driver" #define DRIVER_DESC "Berkshire USB-PC Watchdog driver"
#define DRIVER_LICENSE "GPL" #define DRIVER_LICENSE "GPL"
@ -73,14 +72,18 @@ MODULE_ALIAS_MISCDEV(TEMP_MINOR);
module_param(debug, int, 0); module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "Debug enabled or not"); MODULE_PARM_DESC(debug, "Debug enabled or not");
#define WATCHDOG_HEARTBEAT 0 /* default heartbeat = delay-time from dip-switches */ #define WATCHDOG_HEARTBEAT 0 /* default heartbeat =
delay-time from dip-switches */
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. (0<heartbeat<65536 or 0=delay-time from dip-switches, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
"(0<heartbeat<65536 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);
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) ")");
/* The vendor and product id's for the USB-PC Watchdog card */ /* The vendor and product id's for the USB-PC Watchdog card */
#define USB_PCWD_VENDOR_ID 0x0c98 #define USB_PCWD_VENDOR_ID 0x0c98
@ -98,7 +101,8 @@ MODULE_DEVICE_TABLE (usb, usb_pcwd_table);
#define USB_COMMAND_TIMEOUT 250 #define USB_COMMAND_TIMEOUT 250
/* Watchdog's internal commands */ /* Watchdog's internal commands */
#define CMD_READ_TEMP 0x02 /* Read Temperature; Re-trigger Watchdog */ #define CMD_READ_TEMP 0x02 /* Read Temperature;
Re-trigger Watchdog */
#define CMD_TRIGGER CMD_READ_TEMP #define CMD_TRIGGER CMD_READ_TEMP
#define CMD_GET_STATUS 0x04 /* Get Status Information */ #define CMD_GET_STATUS 0x04 /* Get Status Information */
#define CMD_GET_FIRMWARE_VERSION 0x08 /* Get Firmware Version */ #define CMD_GET_FIRMWARE_VERSION 0x08 /* Get Firmware Version */
@ -129,23 +133,36 @@ static char expect_release;
/* Structure to hold all of our device specific stuff */ /* Structure to hold all of our device specific stuff */
struct usb_pcwd_private { struct usb_pcwd_private {
struct usb_device *udev; /* save off the usb device pointer */ /* save off the usb device pointer */
struct usb_interface *interface; /* the interface for this device */ struct usb_device *udev;
/* the interface for this device */
struct usb_interface *interface;
unsigned int interface_number; /* the interface number used for cmd's */ /* the interface number used for cmd's */
unsigned int interface_number;
unsigned char *intr_buffer; /* the buffer to intr data */ /* the buffer to intr data */
dma_addr_t intr_dma; /* the dma address for the intr buffer */ unsigned char *intr_buffer;
size_t intr_size; /* the size of the intr buffer */ /* the dma address for the intr buffer */
struct urb *intr_urb; /* the urb used for the intr pipe */ dma_addr_t intr_dma;
/* the size of the intr buffer */
size_t intr_size;
/* the urb used for the intr pipe */
struct urb *intr_urb;
unsigned char cmd_command; /* The command that is reported back */ /* The command that is reported back */
unsigned char cmd_data_msb; /* The data MSB that is reported back */ unsigned char cmd_command;
unsigned char cmd_data_lsb; /* The data LSB that is reported back */ /* The data MSB that is reported back */
atomic_t cmd_received; /* true if we received a report after a command */ unsigned char cmd_data_msb;
/* The data LSB that is reported back */
unsigned char cmd_data_lsb;
/* true if we received a report after a command */
atomic_t cmd_received;
int exists; /* Wether or not the device exists */ /* Wether or not the device exists */
struct mutex mtx; /* locks this structure */ int exists;
/* locks this structure */
struct mutex mtx;
}; };
static struct usb_pcwd_private *usb_pcwd_device; static struct usb_pcwd_private *usb_pcwd_device;
@ -153,7 +170,8 @@ static struct usb_pcwd_private *usb_pcwd_device;
static DEFINE_MUTEX(disconnect_mutex); static DEFINE_MUTEX(disconnect_mutex);
/* local function prototypes */ /* local function prototypes */
static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_device_id *id); static int usb_pcwd_probe(struct usb_interface *interface,
const struct usb_device_id *id);
static void usb_pcwd_disconnect(struct usb_interface *interface); static void usb_pcwd_disconnect(struct usb_interface *interface);
/* usb specific object needed to register this driver with the usb subsystem */ /* usb specific object needed to register this driver with the usb subsystem */
@ -167,7 +185,8 @@ static struct usb_driver usb_pcwd_driver = {
static void usb_pcwd_intr_done(struct urb *urb) static void usb_pcwd_intr_done(struct urb *urb)
{ {
struct usb_pcwd_private *usb_pcwd = (struct usb_pcwd_private *)urb->context; struct usb_pcwd_private *usb_pcwd =
(struct usb_pcwd_private *)urb->context;
unsigned char *data = usb_pcwd->intr_buffer; unsigned char *data = usb_pcwd->intr_buffer;
int retval; int retval;
@ -178,11 +197,13 @@ static void usb_pcwd_intr_done(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", __func__, urb->status); dbg("%s - urb shutting down with status: %d", __func__,
urb->status);
return; return;
/* -EPIPE: should clear the halt */ /* -EPIPE: should clear the halt */
default: /* error */ default: /* error */
dbg("%s - nonzero urb status received: %d", __func__, urb->status); dbg("%s - nonzero urb status received: %d", __func__,
urb->status);
goto resubmit; goto resubmit;
} }
@ -199,22 +220,23 @@ static void usb_pcwd_intr_done(struct urb *urb)
resubmit: resubmit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
printk(KERN_ERR PFX "can't resubmit intr, usb_submit_urb failed with result %d\n", printk(KERN_ERR PFX "can't resubmit intr, "
retval); "usb_submit_urb failed with result %d\n", retval);
} }
static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd, unsigned char cmd, static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd,
unsigned char *msb, unsigned char *lsb) unsigned char cmd, unsigned char *msb, unsigned char *lsb)
{ {
int got_response, count; int got_response, count;
unsigned char buf[6]; unsigned char buf[6];
/* We will not send any commands if the USB PCWD device does not exist */ /* We will not send any commands if the USB PCWD device does
* not exist */
if ((!usb_pcwd) || (!usb_pcwd->exists)) if ((!usb_pcwd) || (!usb_pcwd->exists))
return -1; return -1;
/* The USB PC Watchdog uses a 6 byte report format. The board currently uses /* The USB PC Watchdog uses a 6 byte report format.
* only 3 of the six bytes of the report. */ * The board currently uses only 3 of the six bytes of the report. */
buf[0] = cmd; /* Byte 0 = CMD */ buf[0] = cmd; /* Byte 0 = CMD */
buf[1] = *msb; /* Byte 1 = Data MSB */ buf[1] = *msb; /* Byte 1 = Data MSB */
buf[2] = *lsb; /* Byte 2 = Data LSB */ buf[2] = *lsb; /* Byte 2 = Data LSB */
@ -229,12 +251,14 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd, unsigned cha
HID_REQ_SET_REPORT, HID_DT_REPORT, HID_REQ_SET_REPORT, HID_DT_REPORT,
0x0200, usb_pcwd->interface_number, buf, sizeof(buf), 0x0200, usb_pcwd->interface_number, buf, sizeof(buf),
USB_COMMAND_TIMEOUT) != sizeof(buf)) { USB_COMMAND_TIMEOUT) != sizeof(buf)) {
dbg("usb_pcwd_send_command: error in usb_control_msg for cmd 0x%x 0x%x 0x%x\n", cmd, *msb, *lsb); dbg("usb_pcwd_send_command: error in usb_control_msg for "
"cmd 0x%x 0x%x 0x%x\n", cmd, *msb, *lsb);
} }
/* wait till the usb card processed the command, /* wait till the usb card processed the command,
* with a max. timeout of USB_COMMAND_TIMEOUT */ * with a max. timeout of USB_COMMAND_TIMEOUT */
got_response = 0; got_response = 0;
for (count = 0; (count < USB_COMMAND_TIMEOUT) && (!got_response); count++) { for (count = 0; (count < USB_COMMAND_TIMEOUT) && (!got_response);
count++) {
mdelay(1); mdelay(1);
if (atomic_read(&usb_pcwd->cmd_received)) if (atomic_read(&usb_pcwd->cmd_received))
got_response = 1; got_response = 1;
@ -256,10 +280,12 @@ static int usb_pcwd_start(struct usb_pcwd_private *usb_pcwd)
int retval; int retval;
/* Enable Watchdog */ /* Enable Watchdog */
retval = usb_pcwd_send_command(usb_pcwd, CMD_ENABLE_WATCHDOG, &msb, &lsb); retval = usb_pcwd_send_command(usb_pcwd, CMD_ENABLE_WATCHDOG,
&msb, &lsb);
if ((retval == 0) || (lsb == 0)) { if ((retval == 0) || (lsb == 0)) {
printk(KERN_ERR PFX "Card did not acknowledge enable attempt\n"); printk(KERN_ERR PFX
"Card did not acknowledge enable attempt\n");
return -1; return -1;
} }
@ -273,10 +299,12 @@ static int usb_pcwd_stop(struct usb_pcwd_private *usb_pcwd)
int retval; int retval;
/* Disable Watchdog */ /* Disable Watchdog */
retval = usb_pcwd_send_command(usb_pcwd, CMD_DISABLE_WATCHDOG, &msb, &lsb); retval = usb_pcwd_send_command(usb_pcwd, CMD_DISABLE_WATCHDOG,
&msb, &lsb);
if ((retval == 0) || (lsb != 0)) { if ((retval == 0) || (lsb != 0)) {
printk(KERN_ERR PFX "Card did not acknowledge disable attempt\n"); printk(KERN_ERR PFX
"Card did not acknowledge disable attempt\n");
return -1; return -1;
} }
@ -308,7 +336,8 @@ static int usb_pcwd_set_heartbeat(struct usb_pcwd_private *usb_pcwd, int t)
return 0; return 0;
} }
static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, int *temperature) static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd,
int *temperature)
{ {
unsigned char msb, lsb; unsigned char msb, lsb;
@ -323,7 +352,8 @@ static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, int *temp
return 0; return 0;
} }
static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd, int *time_left) static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd,
int *time_left)
{ {
unsigned char msb, lsb; unsigned char msb, lsb;
@ -352,7 +382,8 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data,
* five months ago... */ * five months ago... */
expect_release = 0; expect_release = 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))
@ -475,7 +506,8 @@ static int usb_pcwd_release(struct inode *inode, struct file *file)
if (expect_release == 42) { if (expect_release == 42) {
usb_pcwd_stop(usb_pcwd_device); usb_pcwd_stop(usb_pcwd_device);
} else { } else {
printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); printk(KERN_CRIT PFX
"Unexpected close, not stopping watchdog!\n");
usb_pcwd_keepalive(usb_pcwd_device); usb_pcwd_keepalive(usb_pcwd_device);
} }
expect_release = 0; expect_release = 0;
@ -515,7 +547,8 @@ static int usb_pcwd_temperature_release(struct inode *inode, struct file *file)
* Notify system * Notify system
*/ */
static int usb_pcwd_notify_sys(struct notifier_block *this, unsigned long code, void *unused) static int usb_pcwd_notify_sys(struct notifier_block *this, unsigned long code,
void *unused)
{ {
if (code == SYS_DOWN || code == SYS_HALT) if (code == SYS_DOWN || code == SYS_HALT)
usb_pcwd_stop(usb_pcwd_device); /* Turn the WDT off */ usb_pcwd_stop(usb_pcwd_device); /* Turn the WDT off */
@ -578,7 +611,8 @@ static inline void usb_pcwd_delete(struct usb_pcwd_private *usb_pcwd)
* Called by the usb core when a new device is connected that it thinks * Called by the usb core when a new device is connected that it thinks
* this driver might be interested in. * this driver might be interested in.
*/ */
static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_device_id *id) static int usb_pcwd_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{ {
struct usb_device *udev = interface_to_usbdev(interface); struct usb_device *udev = interface_to_usbdev(interface);
struct usb_host_interface *iface_desc; struct usb_host_interface *iface_desc;
@ -602,16 +636,15 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
/* check out that we have a HID device */ /* check out that we have a HID device */
if (!(iface_desc->desc.bInterfaceClass == USB_CLASS_HID)) { if (!(iface_desc->desc.bInterfaceClass == USB_CLASS_HID)) {
printk(KERN_ERR PFX "The device isn't a Human Interface Device\n"); printk(KERN_ERR PFX
"The device isn't a Human Interface Device\n");
return -ENODEV; return -ENODEV;
} }
/* check out the endpoint: it has to be Interrupt & IN */ /* check out the endpoint: it has to be Interrupt & IN */
endpoint = &iface_desc->endpoint[0].desc; endpoint = &iface_desc->endpoint[0].desc;
if (!((endpoint->bEndpointAddress & USB_DIR_IN) && if (!usb_endpoint_is_int_in(endpoint)) {
((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
== USB_ENDPOINT_XFER_INT))) {
/* we didn't find a Interrupt endpoint with direction IN */ /* we didn't find a Interrupt endpoint with direction IN */
printk(KERN_ERR PFX "Couldn't find an INTR & IN endpoint\n"); printk(KERN_ERR PFX "Couldn't find an INTR & IN endpoint\n");
return -ENODEV; return -ENODEV;
@ -634,10 +667,12 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
usb_pcwd->udev = udev; usb_pcwd->udev = udev;
usb_pcwd->interface = interface; usb_pcwd->interface = interface;
usb_pcwd->interface_number = iface_desc->desc.bInterfaceNumber; usb_pcwd->interface_number = iface_desc->desc.bInterfaceNumber;
usb_pcwd->intr_size = (le16_to_cpu(endpoint->wMaxPacketSize) > 8 ? le16_to_cpu(endpoint->wMaxPacketSize) : 8); usb_pcwd->intr_size = (le16_to_cpu(endpoint->wMaxPacketSize) > 8 ?
le16_to_cpu(endpoint->wMaxPacketSize) : 8);
/* set up the memory buffer's */ /* set up the memory buffer's */
usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size, GFP_ATOMIC, &usb_pcwd->intr_dma); usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size,
GFP_ATOMIC, &usb_pcwd->intr_dma);
if (!usb_pcwd->intr_buffer) { if (!usb_pcwd->intr_buffer) {
printk(KERN_ERR PFX "Out of memory\n"); printk(KERN_ERR PFX "Out of memory\n");
goto error; goto error;
@ -671,7 +706,8 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
usb_pcwd_stop(usb_pcwd); usb_pcwd_stop(usb_pcwd);
/* Get the Firmware Version */ /* Get the Firmware Version */
got_fw_rev = usb_pcwd_send_command(usb_pcwd, CMD_GET_FIRMWARE_VERSION, &fw_rev_major, &fw_rev_minor); got_fw_rev = usb_pcwd_send_command(usb_pcwd, CMD_GET_FIRMWARE_VERSION,
&fw_rev_major, &fw_rev_minor);
if (got_fw_rev) if (got_fw_rev)
sprintf(fw_ver_str, "%u.%02u", fw_rev_major, fw_rev_minor); sprintf(fw_ver_str, "%u.%02u", fw_rev_major, fw_rev_minor);
else else
@ -681,9 +717,11 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
fw_ver_str); fw_ver_str);
/* Get switch settings */ /* Get switch settings */
usb_pcwd_send_command(usb_pcwd, CMD_GET_DIP_SWITCH_SETTINGS, &dummy, &option_switches); usb_pcwd_send_command(usb_pcwd, CMD_GET_DIP_SWITCH_SETTINGS, &dummy,
&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"));
@ -692,30 +730,35 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
if (heartbeat == 0) if (heartbeat == 0)
heartbeat = heartbeat_tbl[(option_switches & 0x07)]; heartbeat = heartbeat_tbl[(option_switches & 0x07)];
/* 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 (usb_pcwd_set_heartbeat(usb_pcwd, heartbeat)) { if (usb_pcwd_set_heartbeat(usb_pcwd, heartbeat)) {
usb_pcwd_set_heartbeat(usb_pcwd, WATCHDOG_HEARTBEAT); usb_pcwd_set_heartbeat(usb_pcwd, WATCHDOG_HEARTBEAT);
printk(KERN_INFO PFX "heartbeat value must be 0<heartbeat<65536, using %d\n", printk(KERN_INFO PFX
"heartbeat value must be 0<heartbeat<65536, using %d\n",
WATCHDOG_HEARTBEAT); WATCHDOG_HEARTBEAT);
} }
retval = register_reboot_notifier(&usb_pcwd_notifier); retval = register_reboot_notifier(&usb_pcwd_notifier);
if (retval != 0) { if (retval != 0) {
printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", printk(KERN_ERR PFX
"cannot register reboot notifier (err=%d)\n",
retval); retval);
goto error; goto error;
} }
retval = misc_register(&usb_pcwd_temperature_miscdev); retval = misc_register(&usb_pcwd_temperature_miscdev);
if (retval != 0) { if (retval != 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",
TEMP_MINOR, retval); TEMP_MINOR, retval);
goto err_out_unregister_reboot; goto err_out_unregister_reboot;
} }
retval = misc_register(&usb_pcwd_miscdev); retval = misc_register(&usb_pcwd_miscdev);
if (retval != 0) { if (retval != 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, retval); WATCHDOG_MINOR, retval);
goto err_out_misc_deregister; goto err_out_misc_deregister;
} }
@ -801,7 +844,7 @@ static int __init usb_pcwd_init(void)
return result; return result;
} }
printk(KERN_INFO PFX DRIVER_DESC " v" DRIVER_VERSION " (" DRIVER_DATE ")\n"); printk(KERN_INFO PFX DRIVER_DESC " v" DRIVER_VERSION "\n");
return 0; return 0;
} }

141
drivers/watchdog/rc32434_wdt.c
Просмотреть файл

@ -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/mach-rc32434/integ.h> /* For the Watchdog registers */
#include <asm/time.h>
#include <asm/mach-rc32434/integ.h>
#define VERSION "0.4" #define PFX KBUILD_MODNAME ": "
#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;
#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="
#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)
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) spin_unlock(&rc32434_wdt_device.io_lock);
{ printk(KERN_INFO PFX "Stopped watchdog timer.\n");
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;
} }
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)
{ {
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,
.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,
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,
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,
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 = {
.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)
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,9 +318,15 @@ 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)
{
rc32434_wdt_stop();
}
static struct platform_driver rc32434_wdt_driver = {
.probe = rc32434_wdt_probe, .probe = rc32434_wdt_probe,
.remove = __devexit_p(rc32434_wdt_remove), .remove = __devexit_p(rc32434_wdt_remove),
.shutdown = rc32434_wdt_shutdown,
.driver = { .driver = {
.name = "rc32434_wdt", .name = "rc32434_wdt",
} }
@ -297,12 +334,12 @@ static struct platform_driver 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);

13
drivers/watchdog/riowd.c
Просмотреть файл

@ -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)
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,
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;
@ -162,7 +161,7 @@ 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,

3
drivers/watchdog/sbc_epx_c3.c
Просмотреть файл

@ -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 */

7
drivers/watchdog/sc1200wdt.c
Просмотреть файл

@ -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)
{ {
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);
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);

3
drivers/watchdog/sc520_wdt.c
Просмотреть файл

@ -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);

3
drivers/watchdog/softdog.c
Просмотреть файл

@ -1,7 +1,8 @@
/* /*
* 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

3
drivers/watchdog/w83697hf_wdt.c
Просмотреть файл

@ -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);

23
drivers/watchdog/w83697ug_wdt.c
Просмотреть файл

@ -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,
(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)
} 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)
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)
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)
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)
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) {

6
drivers/watchdog/wd501p.h
Просмотреть файл

@ -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.
* *

120
drivers/watchdog/wdt.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* 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)");
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)
* 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)
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)
/** /**
* 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)
* 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 0; return status;
} }
#ifdef CONFIG_WDT_501
/** /**
* wdt_get_temperature: * wdt_get_temperature:
* *
@ -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)
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)
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 (!(status & WDC_SR_PSUOVER))
printk(KERN_CRIT "PSU over voltage.\n");
if (!(status & WDC_SR_PSUUNDR))
printk(KERN_CRIT "PSU under voltage.\n");
if (tachometer) { if (tachometer) {
if (!(status & WDC_SR_FANGOOD)) if (!(status & WDC_SR_FANGOOD))
printk(KERN_CRIT "Possible fan fault.\n"); 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)
/* 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|
WDIOF_POWEROVER);
if (tachometer) if (tachometer)
ident.options |= WDIOF_FANFAULT; ident.options |= WDIOF_FANFAULT;
#endif /* CONFIG_WDT_501 */ }
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)
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)
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)
{ {
return 0; return 0;
} }
#endif /* CONFIG_WDT_501 */
/** /**
* notify_sys: * notify_sys:
@ -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 = {
.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 = {
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)
{ {
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)
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)
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);