Skip to content

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

[WATCHDOG 50/57] w83697hf_wdt: cleanup, coding style 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 46a3949d
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 75 deletions
drivers/watchdog/w83697hf_wdt.c
View file @ c1c8dd39
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,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 "w83697hf/hg WDT" #define WATCHDOG_NAME "w83697hf/hg WDT"
...@@ -53,37 +53,43 @@ static DEFINE_SPINLOCK(io_lock); ...@@ -53,37 +53,43 @@ static DEFINE_SPINLOCK(io_lock);
/* You must set this - there is no sane way to probe for this board. */ /* You must set this - there is no sane way to probe for this board. */
static int wdt_io = 0x2e; static int wdt_io = 0x2e;
module_param(wdt_io, int, 0); module_param(wdt_io, int, 0);
MODULE_PARM_DESC(wdt_io, "w83697hf/hg WDT io port (default 0x2e, 0 = autodetect)"); MODULE_PARM_DESC(wdt_io,
"w83697hf/hg WDT io port (default 0x2e, 0 = autodetect)");
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) ")");
static int early_disable = WATCHDOG_EARLY_DISABLE; static int early_disable = WATCHDOG_EARLY_DISABLE;
module_param(early_disable, int, 0); module_param(early_disable, int, 0);
MODULE_PARM_DESC(early_disable, "Watchdog gets disabled at boot time (default=" __MODULE_STRING(WATCHDOG_EARLY_DISABLE) ")"); MODULE_PARM_DESC(early_disable,
"Watchdog gets disabled at boot time (default="
__MODULE_STRING(WATCHDOG_EARLY_DISABLE) ")");
/* /*
* Kernel methods. * Kernel methods.
*/ */
#define W83697HF_EFER (wdt_io+0) /* Extended Function Enable Register */ #define W83697HF_EFER (wdt_io + 0) /* Extended Function Enable Register */
#define W83697HF_EFIR (wdt_io+0) /* Extended Function Index Register (same as EFER) */ #define W83697HF_EFIR (wdt_io + 0) /* Extended Function Index Register
#define W83697HF_EFDR (wdt_io+1) /* Extended Function Data Register */ (same as EFER) */
#define W83697HF_EFDR (wdt_io + 1) /* Extended Function Data Register */
static inline void static inline void w83697hf_unlock(void)
w83697hf_unlock(void)
{ {
outb_p(0x87, W83697HF_EFER); /* Enter extended function mode */ outb_p(0x87, W83697HF_EFER); /* Enter extended function mode */
outb_p(0x87, W83697HF_EFER); /* Again according to manual */ outb_p(0x87, W83697HF_EFER); /* Again according to manual */
} }
static inline void static inline void w83697hf_lock(void)
w83697hf_lock(void)
{ {
outb_p(0xAA, W83697HF_EFER); /* Leave extended function mode */ outb_p(0xAA, W83697HF_EFER); /* Leave extended function mode */
} }
...@@ -93,41 +99,36 @@ w83697hf_lock(void) ...@@ -93,41 +99,36 @@ w83697hf_lock(void)
* w83697hf_write_timeout() must be called with the device unlocked. * w83697hf_write_timeout() must be called with the device unlocked.
*/ */
static unsigned char static unsigned char w83697hf_get_reg(unsigned char reg)
w83697hf_get_reg(unsigned char reg)
{ {
outb_p(reg, W83697HF_EFIR); outb_p(reg, W83697HF_EFIR);
return inb_p(W83697HF_EFDR); return inb_p(W83697HF_EFDR);
} }
static void static void w83697hf_set_reg(unsigned char reg, unsigned char data)
w83697hf_set_reg(unsigned char reg, unsigned char data)
{ {
outb_p(reg, W83697HF_EFIR); outb_p(reg, W83697HF_EFIR);
outb_p(data, W83697HF_EFDR); outb_p(data, W83697HF_EFDR);
} }
static void static void w83697hf_write_timeout(int timeout)
w83697hf_write_timeout(int timeout)
{ {
w83697hf_set_reg(0xF4, timeout); /* Write Timeout counter to CRF4 */ /* Write Timeout counter to CRF4 */
w83697hf_set_reg(0xF4, timeout);
} }
static void static void w83697hf_select_wdt(void)
w83697hf_select_wdt(void)
{ {
w83697hf_unlock(); w83697hf_unlock();
w83697hf_set_reg(0x07, 0x08); /* Switch to logic device 8 (GPIO2) */ w83697hf_set_reg(0x07, 0x08); /* Switch to logic device 8 (GPIO2) */
} }
static inline void static inline void w83697hf_deselect_wdt(void)
w83697hf_deselect_wdt(void)
{ {
w83697hf_lock(); w83697hf_lock();
} }
static void static void w83697hf_init(void)
w83697hf_init(void)
{ {
unsigned char bbuf; unsigned char bbuf;
...@@ -136,7 +137,9 @@ w83697hf_init(void) ...@@ -136,7 +137,9 @@ w83697hf_init(void)
bbuf = w83697hf_get_reg(0x29); bbuf = w83697hf_get_reg(0x29);
bbuf &= ~0x60; bbuf &= ~0x60;
bbuf |= 0x20; bbuf |= 0x20;
w83697hf_set_reg(0x29, bbuf); /* Set pin 119 to WDTO# mode (= CR29, WDT0) */
/* Set pin 119 to WDTO# mode (= CR29, WDT0) */
w83697hf_set_reg(0x29, bbuf);
bbuf = w83697hf_get_reg(0xF3); bbuf = w83697hf_get_reg(0xF3);
bbuf &= ~0x04; bbuf &= ~0x04;
...@@ -145,8 +148,7 @@ w83697hf_init(void) ...@@ -145,8 +148,7 @@ w83697hf_init(void)
w83697hf_deselect_wdt(); w83697hf_deselect_wdt();
} }
static void static void wdt_ping(void)
wdt_ping(void)
{ {
spin_lock(&io_lock); spin_lock(&io_lock);
w83697hf_select_wdt(); w83697hf_select_wdt();
...@@ -157,8 +159,7 @@ wdt_ping(void) ...@@ -157,8 +159,7 @@ wdt_ping(void)
spin_unlock(&io_lock); spin_unlock(&io_lock);
} }
static void static void wdt_enable(void)
wdt_enable(void)
{ {
spin_lock(&io_lock); spin_lock(&io_lock);
w83697hf_select_wdt(); w83697hf_select_wdt();
...@@ -170,8 +171,7 @@ wdt_enable(void) ...@@ -170,8 +171,7 @@ wdt_enable(void)
spin_unlock(&io_lock); spin_unlock(&io_lock);
} }
static void static void wdt_disable(void)
wdt_disable(void)
{ {
spin_lock(&io_lock); spin_lock(&io_lock);
w83697hf_select_wdt(); w83697hf_select_wdt();
...@@ -183,8 +183,7 @@ wdt_disable(void) ...@@ -183,8 +183,7 @@ wdt_disable(void)
spin_unlock(&io_lock); spin_unlock(&io_lock);
} }
static unsigned char static unsigned char wdt_running(void)
wdt_running(void)
{ {
unsigned char t; unsigned char t;
...@@ -199,18 +198,17 @@ wdt_running(void) ...@@ -199,18 +198,17 @@ wdt_running(void)
return t; return t;
} }
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) {
...@@ -231,15 +229,14 @@ wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) ...@@ -231,15 +229,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 const 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 = "W83697HF WDT", .identity = "W83697HF WDT",
}; };
...@@ -295,8 +292,7 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -295,8 +292,7 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
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;
...@@ -308,13 +304,13 @@ wdt_open(struct inode *inode, struct file *file) ...@@ -308,13 +304,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;
...@@ -326,8 +322,7 @@ wdt_close(struct inode *inode, struct file *file) ...@@ -326,8 +322,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) {
...@@ -345,7 +340,7 @@ static const struct file_operations wdt_fops = { ...@@ -345,7 +340,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,
}; };
...@@ -365,36 +360,38 @@ static struct notifier_block wdt_notifier = { ...@@ -365,36 +360,38 @@ static struct notifier_block wdt_notifier = {
.notifier_call = wdt_notify_sys, .notifier_call = wdt_notify_sys,
}; };
static int static int w83697hf_check_wdt(void)
w83697hf_check_wdt(void)
{ {
if (!request_region(wdt_io, 2, WATCHDOG_NAME)) { if (!request_region(wdt_io, 2, WATCHDOG_NAME)) {
printk (KERN_ERR PFX "I/O address 0x%x already in use\n", wdt_io); printk(KERN_ERR PFX
"I/O address 0x%x already in use\n", wdt_io);
return -EIO; return -EIO;
} }
printk (KERN_DEBUG PFX "Looking for watchdog at address 0x%x\n", wdt_io); printk(KERN_DEBUG PFX
"Looking for watchdog at address 0x%x\n", wdt_io);
w83697hf_unlock(); w83697hf_unlock();
if (w83697hf_get_reg(0x20) == 0x60) { if (w83697hf_get_reg(0x20) == 0x60) {
printk (KERN_INFO PFX "watchdog found at address 0x%x\n", wdt_io); printk(KERN_INFO PFX
"watchdog found at address 0x%x\n", wdt_io);
w83697hf_lock(); w83697hf_lock();
return 0; return 0;
} }
w83697hf_lock(); /* Reprotect in case it was a compatible device */ /* Reprotect in case it was a compatible device */
w83697hf_lock();
printk (KERN_INFO PFX "watchdog not found at address 0x%x\n", wdt_io); printk(KERN_INFO PFX "watchdog not found at address 0x%x\n", wdt_io);
release_region(wdt_io, 2); release_region(wdt_io, 2);
return -EIO; return -EIO;
} }
static int w83697hf_ioports[] = { 0x2e, 0x4e, 0x00 }; static int w83697hf_ioports[] = { 0x2e, 0x4e, 0x00 };
static int __init static int __init wdt_init(void)
wdt_init(void)
{ {
int ret, i, found = 0; int ret, i, found = 0;
printk (KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n"); printk(KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n");
if (wdt_io == 0) { if (wdt_io == 0) {
/* we will autodetect the W83697HF/HG watchdog */ /* we will autodetect the W83697HF/HG watchdog */
...@@ -409,7 +406,7 @@ wdt_init(void) ...@@ -409,7 +406,7 @@ wdt_init(void)
} }
if (!found) { if (!found) {
printk (KERN_ERR PFX "No W83697HF/HG could be found\n"); printk(KERN_ERR PFX "No W83697HF/HG could be found\n");
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
...@@ -423,25 +420,27 @@ wdt_init(void) ...@@ -423,25 +420,27 @@ 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
WATCHDOG_TIMEOUT); "timeout value must be 1 <= timeout <= 255, using %d\n",
WATCHDOG_TIMEOUT);
} }
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
WATCHDOG_MINOR, ret); "cannot register miscdev on minor=%d (err=%d)\n",
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:
...@@ -453,8 +452,7 @@ wdt_init(void) ...@@ -453,8 +452,7 @@ 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);
......
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