Skip to content

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

[WATCHDOG 49/57] w83627hf: coding style, 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 8dc244f7
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 92 deletions
drivers/watchdog/w83627hf_wdt.c
View file @ 46a3949d
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h> #include <linux/spinlock.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 WATCHDOG_NAME "w83627hf/thf/hg WDT" #define WATCHDOG_NAME "w83627hf/thf/hg WDT"
...@@ -57,22 +57,26 @@ MODULE_PARM_DESC(wdt_io, "w83627hf/thf WDT io port (default 0x2E)"); ...@@ -57,22 +57,26 @@ MODULE_PARM_DESC(wdt_io, "w83627hf/thf WDT io port (default 0x2E)");
static int timeout = WATCHDOG_TIMEOUT; /* in seconds */ static int timeout = WATCHDOG_TIMEOUT; /* in seconds */
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) "."); MODULE_PARM_DESC(timeout,
"Watchdog timeout in seconds. 1 <= timeout <= 255, 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) ")");
/* /*
* Kernel methods. * Kernel methods.
*/ */
#define WDT_EFER (wdt_io+0) /* Extended Function Enable Registers */ #define WDT_EFER (wdt_io+0) /* Extended Function Enable Registers */
#define WDT_EFIR (wdt_io+0) /* Extended Function Index Register (same as EFER) */ #define WDT_EFIR (wdt_io+0) /* Extended Function Index Register
(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 static void w83627hf_select_wd_register(void)
w83627hf_select_wd_register(void)
{ {
unsigned char c; unsigned char c;
outb_p(0x87, WDT_EFER); /* Enter extended function mode */ outb_p(0x87, WDT_EFER); /* Enter extended function mode */
...@@ -93,43 +97,45 @@ w83627hf_select_wd_register(void) ...@@ -93,43 +97,45 @@ w83627hf_select_wd_register(void)
outb_p(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */ outb_p(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
} }
static void static void w83627hf_unselect_wd_register(void)
w83627hf_unselect_wd_register(void)
{ {
outb_p(0xAA, WDT_EFER); /* Leave extended function mode */ outb_p(0xAA, WDT_EFER); /* Leave extended function mode */
} }
/* tyan motherboards seem to set F5 to 0x4C ? /* tyan motherboards seem to set F5 to 0x4C ?
* So explicitly init to appropriate value. */ * So explicitly init to appropriate value. */
static void
w83627hf_init(void) static void w83627hf_init(void)
{ {
unsigned char t; unsigned char t;
w83627hf_select_wd_register(); w83627hf_select_wd_register();
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 */
if (t != 0) { if (t != 0) {
printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout); printk(KERN_INFO PFX
"Watchdog already running. Resetting timeout to %d sec\n",
timeout);
outb_p(timeout, WDT_EFDR); /* Write back to CRF6 */ outb_p(timeout, WDT_EFDR); /* Write back to CRF6 */
} }
outb_p(0xF5, WDT_EFER); /* Select CRF5 */ outb_p(0xF5, WDT_EFER); /* Select CRF5 */
t=inb_p(WDT_EFDR); /* read CRF5 */ t = inb_p(WDT_EFDR); /* read CRF5 */
t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */ t &= ~0x0C; /* set second mode & disable keyboard
turning off watchdog */
outb_p(t, WDT_EFDR); /* Write back to CRF5 */ outb_p(t, WDT_EFDR); /* Write back to CRF5 */
outb_p(0xF7, WDT_EFER); /* Select CRF7 */ outb_p(0xF7, WDT_EFER); /* Select CRF7 */
t=inb_p(WDT_EFDR); /* read CRF7 */ t = inb_p(WDT_EFDR); /* read CRF7 */
t&=~0xC0; /* disable keyboard & mouse turning off watchdog */ t &= ~0xC0; /* disable keyboard & mouse turning off
watchdog */
outb_p(t, WDT_EFDR); /* Write back to CRF7 */ outb_p(t, WDT_EFDR); /* Write back to CRF7 */
w83627hf_unselect_wd_register(); w83627hf_unselect_wd_register();
} }
static void static void wdt_ctrl(int timeout)
wdt_ctrl(int timeout)
{ {
spin_lock(&io_lock); spin_lock(&io_lock);
...@@ -143,32 +149,28 @@ wdt_ctrl(int timeout) ...@@ -143,32 +149,28 @@ wdt_ctrl(int timeout)
spin_unlock(&io_lock); spin_unlock(&io_lock);
} }
static int static int wdt_ping(void)
wdt_ping(void)
{ {
wdt_ctrl(timeout); wdt_ctrl(timeout);
return 0; return 0;
} }
static int static int wdt_disable(void)
wdt_disable(void)
{ {
wdt_ctrl(0); wdt_ctrl(0);
return 0; return 0;
} }
static int static int wdt_set_heartbeat(int t)
wdt_set_heartbeat(int t)
{ {
if ((t < 1) || (t > 255)) if (t < 1 || t > 255)
return -EINVAL; return -EINVAL;
timeout = t; timeout = t;
return 0; return 0;
} }
static ssize_t static ssize_t wdt_write(struct file *file, const char __user *buf,
wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
if (count) { if (count) {
if (!nowayout) { if (!nowayout) {
...@@ -189,15 +191,14 @@ wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) ...@@ -189,15 +191,14 @@ wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
return count; return count;
} }
static int static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
wdt_ioctl(struct inode *inode, 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;
int new_timeout; int new_timeout;
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 = "W83627HF WDT", .identity = "W83627HF WDT",
}; };
...@@ -207,15 +208,12 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -207,15 +208,12 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
if (copy_to_user(argp, &ident, sizeof(ident))) if (copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT; return -EFAULT;
break; break;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
return put_user(0, p); return put_user(0, p);
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:
wdt_ping(); wdt_ping();
break; break;
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
if (get_user(new_timeout, p)) if (get_user(new_timeout, p))
return -EFAULT; return -EFAULT;
...@@ -223,38 +221,31 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -223,38 +221,31 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
return -EINVAL; return -EINVAL;
wdt_ping(); wdt_ping();
/* Fall */ /* Fall */
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
return put_user(timeout, p); return put_user(timeout, p);
case WDIOC_SETOPTIONS: case WDIOC_SETOPTIONS:
{ {
int options, retval = -EINVAL; int options, retval = -EINVAL;
if (get_user(options, p)) if (get_user(options, p))
return -EFAULT; return -EFAULT;
if (options & WDIOS_DISABLECARD) { if (options & WDIOS_DISABLECARD) {
wdt_disable(); wdt_disable();
retval = 0; retval = 0;
} }
if (options & WDIOS_ENABLECARD) { if (options & WDIOS_ENABLECARD) {
wdt_ping(); wdt_ping();
retval = 0; retval = 0;
} }
return retval; return retval;
} }
default: default:
return -ENOTTY; return -ENOTTY;
} }
return 0; return 0;
} }
static int static int wdt_open(struct inode *inode, struct file *file)
wdt_open(struct inode *inode, struct file *file)
{ {
if (test_and_set_bit(0, &wdt_is_open)) if (test_and_set_bit(0, &wdt_is_open))
return -EBUSY; return -EBUSY;
...@@ -266,13 +257,13 @@ wdt_open(struct inode *inode, struct file *file) ...@@ -266,13 +257,13 @@ wdt_open(struct inode *inode, struct file *file)
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
static int static int wdt_close(struct inode *inode, struct file *file)
wdt_close(struct inode *inode, struct file *file)
{ {
if (expect_close == 42) { if (expect_close == 42)
wdt_disable(); wdt_disable();
} else { else {
printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); printk(KERN_CRIT PFX
"Unexpected close, not stopping watchdog!\n");
wdt_ping(); wdt_ping();
} }
expect_close = 0; expect_close = 0;
...@@ -284,8 +275,7 @@ wdt_close(struct inode *inode, struct file *file) ...@@ -284,8 +275,7 @@ wdt_close(struct inode *inode, struct file *file)
* Notifier for system down * Notifier for system down
*/ */
static int static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
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) {
...@@ -303,7 +293,7 @@ static const struct file_operations wdt_fops = { ...@@ -303,7 +293,7 @@ static const struct file_operations wdt_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = wdt_write, .write = wdt_write,
.ioctl = wdt_ioctl, .unlocked_ioctl = wdt_ioctl,
.open = wdt_open, .open = wdt_open,
.release = wdt_close, .release = wdt_close,
}; };
...@@ -323,8 +313,7 @@ static struct notifier_block wdt_notifier = { ...@@ -323,8 +313,7 @@ static struct notifier_block wdt_notifier = {
.notifier_call = wdt_notify_sys, .notifier_call = wdt_notify_sys,
}; };
static int __init static int __init wdt_init(void)
wdt_init(void)
{ {
int ret; int ret;
...@@ -332,12 +321,13 @@ wdt_init(void) ...@@ -332,12 +321,13 @@ wdt_init(void)
if (wdt_set_heartbeat(timeout)) { if (wdt_set_heartbeat(timeout)) {
wdt_set_heartbeat(WATCHDOG_TIMEOUT); wdt_set_heartbeat(WATCHDOG_TIMEOUT);
printk (KERN_INFO PFX "timeout value must be 1<=timeout<=255, using %d\n", printk(KERN_INFO PFX
"timeout value must be 1 <= timeout <= 255, using %d\n",
WATCHDOG_TIMEOUT); WATCHDOG_TIMEOUT);
} }
if (!request_region(wdt_io, 1, WATCHDOG_NAME)) { if (!request_region(wdt_io, 1, WATCHDOG_NAME)) {
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_io); wdt_io);
ret = -EIO; ret = -EIO;
goto out; goto out;
...@@ -347,19 +337,21 @@ wdt_init(void) ...@@ -347,19 +337,21 @@ wdt_init(void)
ret = register_reboot_notifier(&wdt_notifier); ret = register_reboot_notifier(&wdt_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 unreg_regions; goto unreg_regions;
} }
ret = misc_register(&wdt_miscdev); ret = misc_register(&wdt_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 unreg_reboot; goto unreg_reboot;
} }
printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n", printk(KERN_INFO PFX
"initialized. timeout=%d sec (nowayout=%d)\n",
timeout, nowayout); timeout, nowayout);
out: out:
...@@ -371,12 +363,11 @@ wdt_init(void) ...@@ -371,12 +363,11 @@ wdt_init(void)
goto out; goto out;
} }
static void __exit static void __exit wdt_exit(void)
wdt_exit(void)
{ {
misc_deregister(&wdt_miscdev); misc_deregister(&wdt_miscdev);
unregister_reboot_notifier(&wdt_notifier); unregister_reboot_notifier(&wdt_notifier);
release_region(wdt_io,1); release_region(wdt_io, 1);
} }
module_init(wdt_init); module_init(wdt_init);
......
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