Skip to content

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

[WATCHDOG 37/57] sbc60xxwdt: clean up and switch to unlocked_ioctl 

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 f19e0312
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 113 deletions
drivers/watchdog/sbc60xxwdt.c
View file @ 1780de41
...@@ -16,19 +16,23 @@ ...@@ -16,19 +16,23 @@
* *
* 12/4 - 2000 [Initial revision] * 12/4 - 2000 [Initial revision]
* 25/4 - 2000 Added /dev/watchdog support * 25/4 - 2000 Added /dev/watchdog support
* 09/5 - 2001 [smj@oro.net] fixed fop_write to "return 1" on success * 09/5 - 2001 [smj@oro.net] fixed fop_write to "return 1"
* on success
* 12/4 - 2002 [rob@osinvestor.com] eliminate fop_read * 12/4 - 2002 [rob@osinvestor.com] eliminate fop_read
* fix possible wdt_is_open race * fix possible wdt_is_open race
* add CONFIG_WATCHDOG_NOWAYOUT support * add CONFIG_WATCHDOG_NOWAYOUT support
* remove lock_kernel/unlock_kernel pairs * remove lock_kernel/unlock_kernel pairs
* added KERN_* to printk's * added KERN_* to printk's
* got rid of extraneous comments * got rid of extraneous comments
* changed watchdog_info to correctly reflect what the driver offers * changed watchdog_info to correctly reflect what
* added WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS, WDIOC_SETTIMEOUT, * the driver offers
* WDIOC_GETTIMEOUT, and WDIOC_SETOPTIONS ioctls * added WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS,
* WDIOC_SETTIMEOUT, WDIOC_GETTIMEOUT, and
* WDIOC_SETOPTIONS ioctls
* 09/8 - 2003 [wim@iguana.be] cleanup of trailing spaces * 09/8 - 2003 [wim@iguana.be] cleanup of trailing spaces
* use module_param * use module_param
* made timeout (the emulated heartbeat) a module_param * made timeout (the emulated heartbeat) a
* module_param
* made the keepalive ping an internal subroutine * made the keepalive ping an internal subroutine
* made wdt_stop and wdt_start module params * made wdt_stop and wdt_start module params
* added extra printk's for startup problems * added extra printk's for startup problems
...@@ -56,9 +60,9 @@ ...@@ -56,9 +60,9 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h>
#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
#define OUR_NAME "sbc60xxwdt" #define OUR_NAME "sbc60xxwdt"
...@@ -94,13 +98,18 @@ MODULE_PARM_DESC(wdt_start, "SBC60xx WDT 'start' io port (default 0x443)"); ...@@ -94,13 +98,18 @@ MODULE_PARM_DESC(wdt_start, "SBC60xx WDT 'start' io port (default 0x443)");
*/ */
#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */ #define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */
static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ to get seconds to wait for a ping */ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, multiplied by HZ to
get seconds to wait for a ping */
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); MODULE_PARM_DESC(timeout,
"Watchdog timeout in seconds. (1<=timeout<=3600, 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 void wdt_timer_ping(unsigned long); static void wdt_timer_ping(unsigned long);
static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0); static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
...@@ -117,15 +126,14 @@ static void wdt_timer_ping(unsigned long data) ...@@ -117,15 +126,14 @@ static void wdt_timer_ping(unsigned long data)
/* If we got a heartbeat pulse within the WDT_US_INTERVAL /* If we got a heartbeat pulse within the WDT_US_INTERVAL
* we agree to ping the WDT * we agree to ping the WDT
*/ */
if(time_before(jiffies, next_heartbeat)) if (time_before(jiffies, next_heartbeat)) {
{
/* Ping the WDT by reading from wdt_start */ /* Ping the WDT by reading from wdt_start */
inb_p(wdt_start); inb_p(wdt_start);
/* Re-set the timer interval */ /* Re-set the timer interval */
mod_timer(&timer, jiffies + WDT_INTERVAL); mod_timer(&timer, jiffies + WDT_INTERVAL);
} else { } else
printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n"); printk(KERN_WARNING PFX
} "Heartbeat lost! Will not ping the watchdog\n");
} }
/* /*
...@@ -159,40 +167,40 @@ static void wdt_keepalive(void) ...@@ -159,40 +167,40 @@ static void wdt_keepalive(void)
* /dev/watchdog handling * /dev/watchdog handling
*/ */
static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos) static ssize_t fop_write(struct file *file, const char __user *buf,
size_t count, 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(count) if (count) {
{ if (!nowayout) {
if (!nowayout)
{
size_t ofs; size_t ofs;
/* note: just in case someone wrote the magic character /* note: just in case someone wrote the
* five months ago... */ magic character five months ago... */
wdt_expect_close = 0; wdt_expect_close = 0;
/* scan to see whether or not we got the magic character */ /* scan to see whether or not we got the
for(ofs = 0; ofs != count; ofs++) magic character */
{ for (ofs = 0; ofs != count; ofs++) {
char c; char c;
if(get_user(c, buf+ofs)) if (get_user(c, buf+ofs))
return -EFAULT; return -EFAULT;
if(c == 'V') if (c == 'V')
wdt_expect_close = 42; wdt_expect_close = 42;
} }
} }
/* Well, anyhow someone wrote to us, we should return that favour */ /* Well, anyhow someone wrote to us, we should
return that favour */
wdt_keepalive(); wdt_keepalive();
} }
return count; return count;
} }
static int fop_open(struct inode * inode, struct file * file) static int fop_open(struct inode *inode, struct file *file)
{ {
/* Just in case we're already talking to someone... */ /* Just in case we're already talking to someone... */
if(test_and_set_bit(0, &wdt_is_open)) if (test_and_set_bit(0, &wdt_is_open))
return -EBUSY; return -EBUSY;
if (nowayout) if (nowayout)
...@@ -203,37 +211,36 @@ static int fop_open(struct inode * inode, struct file * file) ...@@ -203,37 +211,36 @@ static int fop_open(struct inode * inode, struct file * file)
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
static int fop_close(struct inode * inode, struct file * file) static int fop_close(struct inode *inode, struct file *file)
{ {
if(wdt_expect_close == 42) if (wdt_expect_close == 42)
wdt_turnoff(); wdt_turnoff();
else { else {
del_timer(&timer); del_timer(&timer);
printk(KERN_CRIT PFX "device file closed unexpectedly. Will not stop the WDT!\n"); printk(KERN_CRIT PFX
"device file closed unexpectedly. Will not stop the WDT!\n");
} }
clear_bit(0, &wdt_is_open); clear_bit(0, &wdt_is_open);
wdt_expect_close = 0; wdt_expect_close = 0;
return 0; return 0;
} }
static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
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 const struct watchdog_info ident = {
{ .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, WDIOF_MAGICCLOSE,
.firmware_version = 1, .firmware_version = 1,
.identity = "SBC60xx", .identity = "SBC60xx",
}; };
switch(cmd) switch (cmd) {
{
default: default:
return -ENOTTY; return -ENOTTY;
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:
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
return put_user(0, p); return put_user(0, p);
...@@ -243,30 +250,25 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -243,30 +250,25 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
case WDIOC_SETOPTIONS: case WDIOC_SETOPTIONS:
{ {
int new_options, retval = -EINVAL; int new_options, retval = -EINVAL;
if (get_user(new_options, p))
if(get_user(new_options, p))
return -EFAULT; return -EFAULT;
if (new_options & WDIOS_DISABLECARD) {
if(new_options & WDIOS_DISABLECARD) {
wdt_turnoff(); wdt_turnoff();
retval = 0; retval = 0;
} }
if (new_options & WDIOS_ENABLECARD) {
if(new_options & WDIOS_ENABLECARD) {
wdt_startup(); wdt_startup();
retval = 0; retval = 0;
} }
return retval; return retval;
} }
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
{ {
int new_timeout; int new_timeout;
if (get_user(new_timeout, p))
if(get_user(new_timeout, p))
return -EFAULT; return -EFAULT;
/* arbitrary upper limit */
if(new_timeout < 1 || new_timeout > 3600) /* arbitrary upper limit */ if (new_timeout < 1 || new_timeout > 3600)
return -EINVAL; return -EINVAL;
timeout = new_timeout; timeout = new_timeout;
...@@ -284,7 +286,7 @@ static const struct file_operations wdt_fops = { ...@@ -284,7 +286,7 @@ static const struct file_operations wdt_fops = {
.write = fop_write, .write = fop_write,
.open = fop_open, .open = fop_open,
.release = fop_close, .release = fop_close,
.ioctl = fop_ioctl, .unlocked_ioctl = fop_ioctl,
}; };
static struct miscdevice wdt_miscdev = { static struct miscdevice wdt_miscdev = {
...@@ -300,7 +302,7 @@ static struct miscdevice wdt_miscdev = { ...@@ -300,7 +302,7 @@ static struct miscdevice wdt_miscdev = {
static int wdt_notify_sys(struct notifier_block *this, unsigned long code, static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
void *unused) void *unused)
{ {
if(code==SYS_DOWN || code==SYS_HALT) if (code == SYS_DOWN || code == SYS_HALT)
wdt_turnoff(); wdt_turnoff();
return NOTIFY_DONE; return NOTIFY_DONE;
} }
...@@ -310,8 +312,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, ...@@ -310,8 +312,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
* turn the timebomb registers off. * turn the timebomb registers off.
*/ */
static struct notifier_block wdt_notifier= static struct notifier_block wdt_notifier = {
{
.notifier_call = wdt_notify_sys, .notifier_call = wdt_notify_sys,
}; };
...@@ -324,23 +325,22 @@ static void __exit sbc60xxwdt_unload(void) ...@@ -324,23 +325,22 @@ static void __exit sbc60xxwdt_unload(void)
unregister_reboot_notifier(&wdt_notifier); unregister_reboot_notifier(&wdt_notifier);
if ((wdt_stop != 0x45) && (wdt_stop != wdt_start)) if ((wdt_stop != 0x45) && (wdt_stop != wdt_start))
release_region(wdt_stop,1); release_region(wdt_stop, 1);
release_region(wdt_start,1); release_region(wdt_start, 1);
} }
static int __init sbc60xxwdt_init(void) static int __init sbc60xxwdt_init(void)
{ {
int rc = -EBUSY; int rc = -EBUSY;
if(timeout < 1 || timeout > 3600) /* arbitrary upper limit */ if (timeout < 1 || timeout > 3600) { /* arbitrary upper limit */
{
timeout = WATCHDOG_TIMEOUT; timeout = WATCHDOG_TIMEOUT;
printk(KERN_INFO PFX "timeout value must be 1<=x<=3600, using %d\n", printk(KERN_INFO PFX
"timeout value must be 1 <= x <= 3600, using %d\n",
timeout); timeout);
} }
if (!request_region(wdt_start, 1, "SBC 60XX WDT")) if (!request_region(wdt_start, 1, "SBC 60XX WDT")) {
{
printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
wdt_start); wdt_start);
rc = -EIO; rc = -EIO;
...@@ -348,11 +348,10 @@ static int __init sbc60xxwdt_init(void) ...@@ -348,11 +348,10 @@ static int __init sbc60xxwdt_init(void)
} }
/* We cannot reserve 0x45 - the kernel already has! */ /* We cannot reserve 0x45 - the kernel already has! */
if ((wdt_stop != 0x45) && (wdt_stop != wdt_start)) if (wdt_stop != 0x45 && wdt_stop != wdt_start) {
{ if (!request_region(wdt_stop, 1, "SBC 60XX WDT")) {
if (!request_region(wdt_stop, 1, "SBC 60XX WDT")) printk(KERN_ERR PFX
{ "I/O address 0x%04x already in use\n",
printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
wdt_stop); wdt_stop);
rc = -EIO; rc = -EIO;
goto err_out_region1; goto err_out_region1;
...@@ -360,21 +359,19 @@ static int __init sbc60xxwdt_init(void) ...@@ -360,21 +359,19 @@ static int __init sbc60xxwdt_init(void)
} }
rc = register_reboot_notifier(&wdt_notifier); rc = register_reboot_notifier(&wdt_notifier);
if (rc) if (rc) {
{ printk(KERN_ERR PFX
printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", "cannot register reboot notifier (err=%d)\n", rc);
rc);
goto err_out_region2; goto err_out_region2;
} }
rc = misc_register(&wdt_miscdev); rc = misc_register(&wdt_miscdev);
if (rc) if (rc) {
{ 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",
wdt_miscdev.minor, rc); wdt_miscdev.minor, rc);
goto err_out_reboot; goto err_out_reboot;
} }
printk(KERN_INFO PFX "WDT driver for 60XX single board computer initialised. timeout=%d sec (nowayout=%d)\n", printk(KERN_INFO PFX "WDT driver for 60XX single board computer initialised. timeout=%d sec (nowayout=%d)\n",
timeout, nowayout); timeout, nowayout);
...@@ -383,10 +380,10 @@ static int __init sbc60xxwdt_init(void) ...@@ -383,10 +380,10 @@ static int __init sbc60xxwdt_init(void)
err_out_reboot: err_out_reboot:
unregister_reboot_notifier(&wdt_notifier); unregister_reboot_notifier(&wdt_notifier);
err_out_region2: err_out_region2:
if ((wdt_stop != 0x45) && (wdt_stop != wdt_start)) if (wdt_stop != 0x45 && wdt_stop != wdt_start)
release_region(wdt_stop,1); release_region(wdt_stop, 1);
err_out_region1: err_out_region1:
release_region(wdt_start,1); release_region(wdt_start, 1);
err_out: err_out:
return rc; return rc;
} }
......
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