Skip to content

L
linux
Commit 0829291e authored by Alan Cox's avatar Alan Cox Committed by Wim Van Sebroeck
Browse files
Options

[WATCHDOG 13/57] i6300esb: Style, unlocked_ioctl, cleanup 

Review and switch to unlocked_ioctl
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 2e43ba73
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 175 deletions
drivers/watchdog/i6300esb.c
View file @ 0829291e
...@@ -38,9 +38,8 @@ ...@@ -38,9 +38,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/uaccess.h>
#include <asm/uaccess.h> #include <linux/io.h>
#include <asm/io.h>
/* Module and version information */ /* Module and version information */
#define ESB_VERSION "0.03" #define ESB_VERSION "0.03"
...@@ -59,17 +58,17 @@ ...@@ -59,17 +58,17 @@
#define ESB_RELOAD_REG BASEADDR + 0x0c /* Reload register */ #define ESB_RELOAD_REG BASEADDR + 0x0c /* Reload register */
/* Lock register bits */ /* Lock register bits */
#define ESB_WDT_FUNC ( 0x01 << 2 ) /* Watchdog functionality */ #define ESB_WDT_FUNC (0x01 << 2) /* Watchdog functionality */
#define ESB_WDT_ENABLE ( 0x01 << 1 ) /* Enable WDT */ #define ESB_WDT_ENABLE (0x01 << 1) /* Enable WDT */
#define ESB_WDT_LOCK ( 0x01 << 0 ) /* Lock (nowayout) */ #define ESB_WDT_LOCK (0x01 << 0) /* Lock (nowayout) */
/* Config register bits */ /* Config register bits */
#define ESB_WDT_REBOOT ( 0x01 << 5 ) /* Enable reboot on timeout */ #define ESB_WDT_REBOOT (0x01 << 5) /* Enable reboot on timeout */
#define ESB_WDT_FREQ ( 0x01 << 2 ) /* Decrement frequency */ #define ESB_WDT_FREQ (0x01 << 2) /* Decrement frequency */
#define ESB_WDT_INTTYPE ( 0x11 << 0 ) /* Interrupt type on timer1 timeout */ #define ESB_WDT_INTTYPE (0x11 << 0) /* Interrupt type on timer1 timeout */
/* Reload register bits */ /* Reload register bits */
#define ESB_WDT_RELOAD ( 0x01 << 8 ) /* prevent timeout */ #define ESB_WDT_RELOAD (0x01 << 8) /* prevent timeout */
/* Magic constants */ /* Magic constants */
#define ESB_UNLOCK1 0x80 /* Step 1 to unlock reset registers */ #define ESB_UNLOCK1 0x80 /* Step 1 to unlock reset registers */
...@@ -84,14 +83,20 @@ static unsigned short triggered; /* The status of the watchdog upon boot */ ...@@ -84,14 +83,20 @@ static unsigned short triggered; /* The status of the watchdog upon boot */
static char esb_expect_close; static char esb_expect_close;
/* module parameters */ /* module parameters */
#define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat (1<heartbeat<2*1023) */ /* 30 sec default heartbeat (1 < heartbeat < 2*1023) */
#define WATCHDOG_HEARTBEAT 30
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. (1<heartbeat<2046, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat,
"Watchdog heartbeat in seconds. (1<heartbeat<2046, 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) ")");
/* /*
* Some i6300ESB specific functions * Some i6300ESB specific functions
...@@ -104,8 +109,8 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" _ ...@@ -104,8 +109,8 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" _
* to once before they need to be unlocked again. * to once before they need to be unlocked again.
*/ */
static inline void esb_unlock_registers(void) { static inline void esb_unlock_registers(void) {
writeb(ESB_UNLOCK1, ESB_RELOAD_REG); writeb(ESB_UNLOCK1, ESB_RELOAD_REG);
writeb(ESB_UNLOCK2, ESB_RELOAD_REG); writeb(ESB_UNLOCK2, ESB_RELOAD_REG);
} }
static void esb_timer_start(void) static void esb_timer_start(void)
...@@ -114,8 +119,7 @@ static void esb_timer_start(void) ...@@ -114,8 +119,7 @@ static void esb_timer_start(void)
/* 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);
} }
static int esb_timer_stop(void) static int esb_timer_stop(void)
...@@ -140,7 +144,7 @@ static void esb_timer_keepalive(void) ...@@ -140,7 +144,7 @@ static void esb_timer_keepalive(void)
spin_lock(&esb_lock); spin_lock(&esb_lock);
esb_unlock_registers(); esb_unlock_registers();
writew(ESB_WDT_RELOAD, ESB_RELOAD_REG); writew(ESB_WDT_RELOAD, ESB_RELOAD_REG);
/* FIXME: Do we need to flush anything here? */ /* FIXME: Do we need to flush anything here? */
spin_unlock(&esb_lock); spin_unlock(&esb_lock);
} }
...@@ -167,7 +171,7 @@ static int esb_timer_set_heartbeat(int time) ...@@ -167,7 +171,7 @@ static int esb_timer_set_heartbeat(int time)
esb_unlock_registers(); esb_unlock_registers();
writel(val, ESB_TIMER2_REG); writel(val, ESB_TIMER2_REG);
/* Reload */ /* Reload */
esb_unlock_registers(); esb_unlock_registers();
writew(ESB_WDT_RELOAD, ESB_RELOAD_REG); writew(ESB_WDT_RELOAD, ESB_RELOAD_REG);
...@@ -179,54 +183,55 @@ static int esb_timer_set_heartbeat(int time) ...@@ -179,54 +183,55 @@ static int esb_timer_set_heartbeat(int time)
return 0; return 0;
} }
static int esb_timer_read (void) static int esb_timer_read(void)
{ {
u32 count; u32 count;
/* This isn't documented, and doesn't take into /* This isn't documented, and doesn't take into
* acount which stage is running, but it looks * acount which stage is running, but it looks
* like a 20 bit count down, so we might as well report it. * like a 20 bit count down, so we might as well report it.
*/ */
pci_read_config_dword(esb_pci, 0x64, &count); pci_read_config_dword(esb_pci, 0x64, &count);
return (int)count; return (int)count;
} }
/* /*
* /dev/watchdog handling * /dev/watchdog handling
*/ */
static int esb_open (struct inode *inode, struct file *file) static int esb_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, &timer_alive)) if (test_and_set_bit(0, &timer_alive))
return -EBUSY; return -EBUSY;
/* Reload and activate timer */ /* Reload and activate timer */
esb_timer_keepalive (); esb_timer_keepalive();
esb_timer_start (); esb_timer_start();
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
static int esb_release (struct inode *inode, struct file *file) static int esb_release(struct inode *inode, struct file *file)
{ {
/* Shut off the timer. */ /* Shut off the timer. */
if (esb_expect_close == 42) { if (esb_expect_close == 42)
esb_timer_stop (); esb_timer_stop();
} else { else {
printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); printk(KERN_CRIT PFX
esb_timer_keepalive (); "Unexpected close, not stopping watchdog!\n");
} esb_timer_keepalive();
clear_bit(0, &timer_alive); }
esb_expect_close = 0; clear_bit(0, &timer_alive);
return 0; esb_expect_close = 0;
return 0;
} }
static ssize_t esb_write (struct file *file, const char __user *data, static ssize_t esb_write(struct file *file, const char __user *data,
size_t len, loff_t * ppos) size_t len, loff_t *ppos)
{ {
/* See if we got the magic character 'V' and reload the timer */ /* See if we got the magic character 'V' and reload the timer */
if (len) { if (len) {
if (!nowayout) { if (!nowayout) {
size_t i; size_t i;
...@@ -237,7 +242,7 @@ static ssize_t esb_write (struct file *file, const char __user *data, ...@@ -237,7 +242,7 @@ static ssize_t esb_write (struct file *file, const char __user *data,
/* 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))
return -EFAULT; return -EFAULT;
if (c == 'V') if (c == 'V')
esb_expect_close = 42; esb_expect_close = 42;
...@@ -245,13 +250,12 @@ static ssize_t esb_write (struct file *file, const char __user *data, ...@@ -245,13 +250,12 @@ static ssize_t esb_write (struct file *file, const char __user *data,
} }
/* someone wrote to us, we should reload the timer */ /* someone wrote to us, we should reload the timer */
esb_timer_keepalive (); esb_timer_keepalive();
} }
return len; return len;
} }
static int esb_ioctl (struct inode *inode, struct file *file, static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
int new_options, retval = -EINVAL; int new_options, retval = -EINVAL;
int new_heartbeat; int new_heartbeat;
...@@ -266,71 +270,65 @@ static int esb_ioctl (struct inode *inode, struct file *file, ...@@ -266,71 +270,65 @@ static int esb_ioctl (struct inode *inode, struct file *file,
}; };
switch (cmd) { switch (cmd) {
case WDIOC_GETSUPPORT: case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident, return copy_to_user(argp, &ident,
sizeof (ident)) ? -EFAULT : 0; sizeof(ident)) ? -EFAULT : 0;
case WDIOC_GETSTATUS:
return put_user (esb_timer_read(), p);
case WDIOC_GETBOOTSTATUS:
return put_user (triggered, p);
case WDIOC_KEEPALIVE:
esb_timer_keepalive ();
return 0;
case WDIOC_SETOPTIONS: case WDIOC_GETSTATUS:
{ return put_user(esb_timer_read(), p);
if (get_user (new_options, p))
return -EFAULT;
if (new_options & WDIOS_DISABLECARD) { case WDIOC_GETBOOTSTATUS:
esb_timer_stop (); return put_user(triggered, p);
retval = 0;
}
if (new_options & WDIOS_ENABLECARD) { case WDIOC_KEEPALIVE:
esb_timer_keepalive (); esb_timer_keepalive();
esb_timer_start (); return 0;
retval = 0;
}
return retval; case WDIOC_SETOPTIONS:
} {
if (get_user(new_options, p))
return -EFAULT;
case WDIOC_SETTIMEOUT: if (new_options & WDIOS_DISABLECARD) {
{ esb_timer_stop();
if (get_user(new_heartbeat, p)) retval = 0;
return -EFAULT; }
if (esb_timer_set_heartbeat(new_heartbeat))
return -EINVAL;
esb_timer_keepalive ();
/* Fall */
}
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);
default: if (new_options & WDIOS_ENABLECARD) {
return -ENOTTY; esb_timer_keepalive();
} esb_timer_start();
retval = 0;
}
return retval;
}
case WDIOC_SETTIMEOUT:
{
if (get_user(new_heartbeat, p))
return -EFAULT;
if (esb_timer_set_heartbeat(new_heartbeat))
return -EINVAL;
esb_timer_keepalive();
/* Fall */
}
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);
default:
return -ENOTTY;
}
} }
/* /*
* Notify system * Notify system
*/ */
static int esb_notify_sys (struct notifier_block *this, unsigned long code, void *unused) static int esb_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) {
/* Turn the WDT off */ /* Turn the WDT off */
esb_timer_stop (); esb_timer_stop();
} }
return NOTIFY_DONE;
return NOTIFY_DONE;
} }
/* /*
...@@ -338,22 +336,22 @@ static int esb_notify_sys (struct notifier_block *this, unsigned long code, void ...@@ -338,22 +336,22 @@ static int esb_notify_sys (struct notifier_block *this, unsigned long code, void
*/ */
static const struct file_operations esb_fops = { static const struct file_operations esb_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = esb_write, .write = esb_write,
.ioctl = esb_ioctl, .unlocked_ioctl = esb_ioctl,
.open = esb_open, .open = esb_open,
.release = esb_release, .release = esb_release,
}; };
static struct miscdevice esb_miscdev = { static struct miscdevice esb_miscdev = {
.minor = WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
.name = "watchdog", .name = "watchdog",
.fops = &esb_fops, .fops = &esb_fops,
}; };
static struct notifier_block esb_notifier = { static struct notifier_block esb_notifier = {
.notifier_call = esb_notify_sys, .notifier_call = esb_notify_sys,
}; };
/* /*
...@@ -365,50 +363,44 @@ static struct notifier_block esb_notifier = { ...@@ -365,50 +363,44 @@ static struct notifier_block esb_notifier = {
* want to register another driver on the same PCI id. * want to register another driver on the same PCI id.
*/ */
static struct pci_device_id esb_pci_tbl[] = { static struct pci_device_id esb_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), },
{ 0, }, /* End of list */ { 0, }, /* End of list */
}; };
MODULE_DEVICE_TABLE (pci, esb_pci_tbl); MODULE_DEVICE_TABLE(pci, esb_pci_tbl);
/* /*
* Init & exit routines * Init & exit routines
*/ */
static unsigned char __init esb_getdevice (void) static unsigned char __init esb_getdevice(void)
{ {
u8 val1; u8 val1;
unsigned short val2; unsigned short val2;
/*
* Find the PCI device
*/
struct pci_dev *dev = NULL; esb_pci = pci_get_device(PCI_VENDOR_ID_INTEL,
/* PCI_DEVICE_ID_INTEL_ESB_9, NULL);
* Find the PCI device
*/
for_each_pci_dev(dev) {
if (pci_match_id(esb_pci_tbl, dev)) {
esb_pci = dev;
break;
}
}
if (esb_pci) { if (esb_pci) {
if (pci_enable_device(esb_pci)) { if (pci_enable_device(esb_pci)) {
printk (KERN_ERR PFX "failed to enable device\n"); printk(KERN_ERR PFX "failed to enable device\n");
goto err_devput; goto err_devput;
} }
if (pci_request_region(esb_pci, 0, ESB_MODULE_NAME)) { if (pci_request_region(esb_pci, 0, ESB_MODULE_NAME)) {
printk (KERN_ERR PFX "failed to request region\n"); printk(KERN_ERR PFX "failed to request region\n");
goto err_disable; goto err_disable;
} }
BASEADDR = ioremap(pci_resource_start(esb_pci, 0), BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
pci_resource_len(esb_pci, 0)); pci_resource_len(esb_pci, 0));
if (BASEADDR == NULL) { if (BASEADDR == NULL) {
/* Something's wrong here, BASEADDR has to be set */ /* Something's wrong here, BASEADDR has to be set */
printk (KERN_ERR PFX "failed to get BASEADDR\n"); printk(KERN_ERR PFX "failed to get BASEADDR\n");
goto err_release; goto err_release;
} }
/* /*
* The watchdog has two timers, it can be setup so that the * The watchdog has two timers, it can be setup so that the
...@@ -425,7 +417,7 @@ static unsigned char __init esb_getdevice (void) ...@@ -425,7 +417,7 @@ static unsigned char __init esb_getdevice (void)
/* Check that the WDT isn't already locked */ /* Check that the WDT isn't already locked */
pci_read_config_byte(esb_pci, ESB_LOCK_REG, &val1); pci_read_config_byte(esb_pci, ESB_LOCK_REG, &val1);
if (val1 & ESB_WDT_LOCK) if (val1 & ESB_WDT_LOCK)
printk (KERN_WARNING PFX "nowayout already set\n"); printk(KERN_WARNING PFX "nowayout already set\n");
/* Set the timer to watchdog mode and disable it for now */ /* Set the timer to watchdog mode and disable it for now */
pci_write_config_byte(esb_pci, ESB_LOCK_REG, 0x00); pci_write_config_byte(esb_pci, ESB_LOCK_REG, 0x00);
...@@ -452,44 +444,44 @@ static unsigned char __init esb_getdevice (void) ...@@ -452,44 +444,44 @@ static unsigned char __init esb_getdevice (void)
return 0; return 0;
} }
static int __init watchdog_init (void) static int __init watchdog_init(void)
{ {
int ret; int ret;
/* Check whether or not the hardware watchdog is there */ /* Check whether or not the hardware watchdog is there */
if (!esb_getdevice () || esb_pci == NULL) if (!esb_getdevice() || esb_pci == NULL)
return -ENODEV; return -ENODEV;
/* 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 (esb_timer_set_heartbeat (heartbeat)) { if not reset to the default */
esb_timer_set_heartbeat (WATCHDOG_HEARTBEAT); if (esb_timer_set_heartbeat(heartbeat)) {
printk(KERN_INFO PFX "heartbeat value must be 1<heartbeat<2046, using %d\n", esb_timer_set_heartbeat(WATCHDOG_HEARTBEAT);
heartbeat); printk(KERN_INFO PFX
} "heartbeat value must be 1<heartbeat<2046, using %d\n",
heartbeat);
ret = register_reboot_notifier(&esb_notifier); }
if (ret != 0) { ret = register_reboot_notifier(&esb_notifier);
printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", if (ret != 0) {
ret); printk(KERN_ERR PFX
goto err_unmap; "cannot register reboot notifier (err=%d)\n", ret);
} goto err_unmap;
}
ret = misc_register(&esb_miscdev);
if (ret != 0) {
printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, ret);
goto err_notifier;
}
esb_timer_stop ();
printk (KERN_INFO PFX "initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
BASEADDR, heartbeat, nowayout);
return 0; ret = misc_register(&esb_miscdev);
if (ret != 0) {
printk(KERN_ERR PFX
"cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, ret);
goto err_notifier;
}
esb_timer_stop();
printk(KERN_INFO PFX
"initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
BASEADDR, heartbeat, nowayout);
return 0;
err_notifier: err_notifier:
unregister_reboot_notifier(&esb_notifier); unregister_reboot_notifier(&esb_notifier);
err_unmap: err_unmap:
iounmap(BASEADDR); iounmap(BASEADDR);
/* err_release: */ /* err_release: */
...@@ -498,18 +490,18 @@ static int __init watchdog_init (void) ...@@ -498,18 +490,18 @@ static int __init watchdog_init (void)
pci_disable_device(esb_pci); pci_disable_device(esb_pci);
/* err_devput: */ /* err_devput: */
pci_dev_put(esb_pci); pci_dev_put(esb_pci);
return ret; return ret;
} }
static void __exit watchdog_cleanup (void) static void __exit watchdog_cleanup(void)
{ {
/* Stop the timer before we leave */ /* Stop the timer before we leave */
if (!nowayout) if (!nowayout)
esb_timer_stop (); esb_timer_stop();
/* Deregister */ /* Deregister */
misc_deregister(&esb_miscdev); misc_deregister(&esb_miscdev);
unregister_reboot_notifier(&esb_notifier); 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7