Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 aee334c2 编写于 作者: A Alan Cox 提交者： Wim Van Sebroeck
浏览文件
操作

[WATCHDOG 31/57] pc87413_wdt: clean up, coding style, unlocked_ioctl 

Review and switch to unlocked_ioctl
Signed-off-by: NAlan Cox <alan@redhat.com>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
上级 12b9df7d
隐藏空白更改
内联 并排
Showing with 87 addition and 124 deletion
drivers/watchdog/pc87413_wdt.c
浏览文件 @ aee334c2
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/version.h> #include <linux/version.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 DEBUG 1 */ /* #define DEBUG 1 */
...@@ -56,12 +56,12 @@ ...@@ -56,12 +56,12 @@
static int io = 0x2E; /* Address used on Portwell Boards */ static int io = 0x2E; /* Address used on Portwell Boards */
static int timeout = DEFAULT_TIMEOUT; /* timeout value */ static int timeout = DEFAULT_TIMEOUT; /* timeout value */
static unsigned long timer_enabled = 0; /* is the timer enabled? */ static unsigned long timer_enabled; /* is the timer enabled? */
static char expect_close; /* is the close expected? */ static char expect_close; /* is the close expected? */
static DEFINE_SPINLOCK(io_lock);/* to guard the watchdog from io races */ static DEFINE_SPINLOCK(io_lock); /* to guard us from io races */
static int nowayout = WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
...@@ -69,7 +69,7 @@ static int nowayout = WATCHDOG_NOWAYOUT; ...@@ -69,7 +69,7 @@ static int nowayout = WATCHDOG_NOWAYOUT;
/* Select pins for Watchdog output */ /* Select pins for Watchdog output */
static inline void pc87413_select_wdt_out (void) static inline void pc87413_select_wdt_out(void)
{ {
unsigned int cr_data = 0; unsigned int cr_data = 0;
...@@ -77,7 +77,7 @@ static inline void pc87413_select_wdt_out (void) ...@@ -77,7 +77,7 @@ static inline void pc87413_select_wdt_out (void)
outb_p(SIOCFG2, WDT_INDEX_IO_PORT); outb_p(SIOCFG2, WDT_INDEX_IO_PORT);
cr_data = inb (WDT_DATA_IO_PORT); cr_data = inb(WDT_DATA_IO_PORT);
cr_data |= 0x80; /* Set Bit7 to 1*/ cr_data |= 0x80; /* Set Bit7 to 1*/
outb_p(SIOCFG2, WDT_INDEX_IO_PORT); outb_p(SIOCFG2, WDT_INDEX_IO_PORT);
...@@ -85,8 +85,9 @@ static inline void pc87413_select_wdt_out (void) ...@@ -85,8 +85,9 @@ static inline void pc87413_select_wdt_out (void)
outb_p(cr_data, WDT_DATA_IO_PORT); outb_p(cr_data, WDT_DATA_IO_PORT);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Select multiple pin,pin55,as WDT output:" printk(KERN_INFO DPFX
" Bit7 to 1: %d\n", cr_data); "Select multiple pin,pin55,as WDT output: Bit7 to 1: %d\n",
cr_data);
#endif #endif
} }
...@@ -94,7 +95,7 @@ static inline void pc87413_select_wdt_out (void) ...@@ -94,7 +95,7 @@ static inline void pc87413_select_wdt_out (void)
static inline void pc87413_enable_swc(void) static inline void pc87413_enable_swc(void)
{ {
unsigned int cr_data=0; unsigned int cr_data = 0;
/* Step 2: Enable SWC functions */ /* Step 2: Enable SWC functions */
...@@ -129,12 +130,11 @@ static inline unsigned int pc87413_get_swc_base(void) ...@@ -129,12 +130,11 @@ static inline unsigned int pc87413_get_swc_base(void)
addr_l = inb(WDT_DATA_IO_PORT); addr_l = inb(WDT_DATA_IO_PORT);
swc_base_addr = (addr_h << 8) + addr_l; swc_base_addr = (addr_h << 8) + addr_l;
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Read SWC I/O Base Address: low %d, high %d," printk(KERN_INFO DPFX
" res %d\n", addr_l, addr_h, swc_base_addr); "Read SWC I/O Base Address: low %d, high %d, res %d\n",
addr_l, addr_h, swc_base_addr);
#endif #endif
return swc_base_addr; return swc_base_addr;
} }
...@@ -143,9 +143,7 @@ static inline unsigned int pc87413_get_swc_base(void) ...@@ -143,9 +143,7 @@ static inline unsigned int pc87413_get_swc_base(void)
static inline void pc87413_swc_bank3(unsigned int swc_base_addr) static inline void pc87413_swc_bank3(unsigned int swc_base_addr)
{ {
/* Step 4: Select Bank3 of SWC */ /* Step 4: Select Bank3 of SWC */
outb_p(inb(swc_base_addr + 0x0f) | 0x03, swc_base_addr + 0x0f); outb_p(inb(swc_base_addr + 0x0f) | 0x03, swc_base_addr + 0x0f);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Select Bank3 of SWC\n"); printk(KERN_INFO DPFX "Select Bank3 of SWC\n");
#endif #endif
...@@ -157,9 +155,7 @@ static inline void pc87413_programm_wdto(unsigned int swc_base_addr, ...@@ -157,9 +155,7 @@ static inline void pc87413_programm_wdto(unsigned int swc_base_addr,
char pc87413_time) char pc87413_time)
{ {
/* Step 5: Programm WDTO, Twd. */ /* Step 5: Programm WDTO, Twd. */
outb_p(pc87413_time, swc_base_addr + WDTO); outb_p(pc87413_time, swc_base_addr + WDTO);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Set WDTO to %d minutes\n", pc87413_time); printk(KERN_INFO DPFX "Set WDTO to %d minutes\n", pc87413_time);
#endif #endif
...@@ -170,9 +166,7 @@ static inline void pc87413_programm_wdto(unsigned int swc_base_addr, ...@@ -170,9 +166,7 @@ static inline void pc87413_programm_wdto(unsigned int swc_base_addr,
static inline void pc87413_enable_wden(unsigned int swc_base_addr) static inline void pc87413_enable_wden(unsigned int swc_base_addr)
{ {
/* Step 6: Enable WDEN */ /* Step 6: Enable WDEN */
outb_p(inb(swc_base_addr + WDCTL) | 0x01, swc_base_addr + WDCTL);
outb_p(inb (swc_base_addr + WDCTL) | 0x01, swc_base_addr + WDCTL);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Enable WDEN\n"); printk(KERN_INFO DPFX "Enable WDEN\n");
#endif #endif
...@@ -182,9 +176,7 @@ static inline void pc87413_enable_wden(unsigned int swc_base_addr) ...@@ -182,9 +176,7 @@ static inline void pc87413_enable_wden(unsigned int swc_base_addr)
static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr) static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr)
{ {
/* Enable SW_WD_TREN */ /* Enable SW_WD_TREN */
outb_p(inb(swc_base_addr + WDCFG) | 0x80, swc_base_addr + WDCFG);
outb_p(inb (swc_base_addr + WDCFG) | 0x80, swc_base_addr + WDCFG);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Enable SW_WD_TREN\n"); printk(KERN_INFO DPFX "Enable SW_WD_TREN\n");
#endif #endif
...@@ -195,9 +187,7 @@ static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr) ...@@ -195,9 +187,7 @@ static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr)
static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr) static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr)
{ {
/* Disable SW_WD_TREN */ /* Disable SW_WD_TREN */
outb_p(inb(swc_base_addr + WDCFG) & 0x7f, swc_base_addr + WDCFG);
outb_p(inb (swc_base_addr + WDCFG) & 0x7f, swc_base_addr + WDCFG);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "pc87413 - Disable SW_WD_TREN\n"); printk(KERN_INFO DPFX "pc87413 - Disable SW_WD_TREN\n");
#endif #endif
...@@ -208,9 +198,7 @@ static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr) ...@@ -208,9 +198,7 @@ static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr)
static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr) static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr)
{ {
/* Enable SW_WD_TRG */ /* Enable SW_WD_TRG */
outb_p(inb(swc_base_addr + WDCTL) | 0x80, swc_base_addr + WDCTL);
outb_p(inb (swc_base_addr + WDCTL) | 0x80, swc_base_addr + WDCTL);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "pc87413 - Enable SW_WD_TRG\n"); printk(KERN_INFO DPFX "pc87413 - Enable SW_WD_TRG\n");
#endif #endif
...@@ -221,9 +209,7 @@ static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr) ...@@ -221,9 +209,7 @@ static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr)
static inline void pc87413_disable_sw_wd_trg(unsigned int swc_base_addr) static inline void pc87413_disable_sw_wd_trg(unsigned int swc_base_addr)
{ {
/* Disable SW_WD_TRG */ /* Disable SW_WD_TRG */
outb_p(inb(swc_base_addr + WDCTL) & 0x7f, swc_base_addr + WDCTL);
outb_p(inb (swc_base_addr + WDCTL) & 0x7f, swc_base_addr + WDCTL);
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "Disable SW_WD_TRG\n"); printk(KERN_INFO DPFX "Disable SW_WD_TRG\n");
#endif #endif
...@@ -314,8 +300,8 @@ static int pc87413_open(struct inode *inode, struct file *file) ...@@ -314,8 +300,8 @@ static int pc87413_open(struct inode *inode, struct file *file)
/* Reload and activate timer */ /* Reload and activate timer */
pc87413_refresh(); pc87413_refresh();
printk(KERN_INFO MODNAME "Watchdog enabled. Timeout set to" printk(KERN_INFO MODNAME
" %d minute(s).\n", timeout); "Watchdog enabled. Timeout set to %d minute(s).\n", timeout);
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
...@@ -338,17 +324,15 @@ static int pc87413_release(struct inode *inode, struct file *file) ...@@ -338,17 +324,15 @@ static int pc87413_release(struct inode *inode, struct file *file)
if (expect_close == 42) { if (expect_close == 42) {
pc87413_disable(); pc87413_disable();
printk(KERN_INFO MODNAME "Watchdog disabled," printk(KERN_INFO MODNAME
" sleeping again...\n"); "Watchdog disabled, sleeping again...\n");
} else { } else {
printk(KERN_CRIT MODNAME "Unexpected close, not stopping" printk(KERN_CRIT MODNAME
" watchdog!\n"); "Unexpected close, not stopping watchdog!\n");
pc87413_refresh(); pc87413_refresh();
} }
clear_bit(0, &timer_enabled); clear_bit(0, &timer_enabled);
expect_close = 0; expect_close = 0;
return 0; return 0;
} }
...@@ -386,7 +370,8 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, ...@@ -386,7 +370,8 @@ static ssize_t pc87413_write(struct file *file, const char __user *data,
/* reset expect flag */ /* reset expect flag */
expect_close = 0; 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))
...@@ -404,7 +389,6 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, ...@@ -404,7 +389,6 @@ static ssize_t pc87413_write(struct file *file, const char __user *data,
/** /**
* pc87413_ioctl: * pc87413_ioctl:
* @inode: inode of the device
* @file: file handle to the device * @file: file handle to the device
* @cmd: watchdog command * @cmd: watchdog command
* @arg: argument pointer * @arg: argument pointer
...@@ -414,8 +398,8 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, ...@@ -414,8 +398,8 @@ static ssize_t pc87413_write(struct file *file, const char __user *data,
* querying capabilities and current status. * querying capabilities and current status.
*/ */
static int pc87413_ioctl(struct inode *inode, struct file *file, static long pc87413_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
int new_timeout; int new_timeout;
...@@ -426,75 +410,58 @@ static int pc87413_ioctl(struct inode *inode, struct file *file, ...@@ -426,75 +410,58 @@ static int pc87413_ioctl(struct inode *inode, struct file *file,
static struct watchdog_info ident = { static struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | .options = WDIOF_KEEPALIVEPING |
WDIOF_SETTIMEOUT | WDIOF_SETTIMEOUT |
WDIOF_MAGICCLOSE, WDIOF_MAGICCLOSE,
.firmware_version = 1, .firmware_version = 1,
.identity = "PC87413(HF/F) watchdog" .identity = "PC87413(HF/F) watchdog"
}; };
uarg.i = (int __user *)arg; uarg.i = (int __user *)arg;
switch(cmd) { switch (cmd) {
default: case WDIOC_GETSUPPORT:
return -ENOTTY; return copy_to_user(uarg.ident, &ident,
sizeof(ident)) ? -EFAULT : 0;
case WDIOC_GETSUPPORT: case WDIOC_GETSTATUS:
return copy_to_user(uarg.ident, &ident, return put_user(pc87413_status(), uarg.i);
sizeof(ident)) ? -EFAULT : 0; case WDIOC_GETBOOTSTATUS:
return put_user(0, uarg.i);
case WDIOC_GETSTATUS: case WDIOC_KEEPALIVE:
return put_user(pc87413_status(), uarg.i); pc87413_refresh();
case WDIOC_GETBOOTSTATUS:
return put_user(0, uarg.i);
case WDIOC_KEEPALIVE:
pc87413_refresh();
#ifdef DEBUG #ifdef DEBUG
printk(KERN_INFO DPFX "keepalive\n"); printk(KERN_INFO DPFX "keepalive\n");
#endif #endif
return 0; return 0;
case WDIOC_SETTIMEOUT:
case WDIOC_SETTIMEOUT: if (get_user(new_timeout, uarg.i))
if (get_user(new_timeout, uarg.i)) return -EFAULT;
return -EFAULT; /* the API states this is given in secs */
new_timeout /= 60;
// the API states this is given in secs if (new_timeout < 0 || new_timeout > MAX_TIMEOUT)
new_timeout /= 60; return -EINVAL;
timeout = new_timeout;
if (new_timeout < 0 || new_timeout > MAX_TIMEOUT) pc87413_refresh();
return -EINVAL; /* fall through and return the new timeout... */
case WDIOC_GETTIMEOUT:
timeout = new_timeout; new_timeout = timeout * 60;
pc87413_refresh(); return put_user(new_timeout, uarg.i);
case WDIOC_SETOPTIONS:
// fall through and return the new timeout... {
int options, retval = -EINVAL;
case WDIOC_GETTIMEOUT: if (get_user(options, uarg.i))
return -EFAULT;
new_timeout = timeout * 60; if (options & WDIOS_DISABLECARD) {
pc87413_disable();
return put_user(new_timeout, uarg.i); retval = 0;
case WDIOC_SETOPTIONS:
{
int options, retval = -EINVAL;
if (get_user(options, uarg.i))
return -EFAULT;
if (options & WDIOS_DISABLECARD) {
pc87413_disable();
retval = 0;
}
if (options & WDIOS_ENABLECARD) {
pc87413_enable();
retval = 0;
}
return retval;
} }
if (options & WDIOS_ENABLECARD) {
pc87413_enable();
retval = 0;
}
return retval;
}
default:
return -ENOTTY;
} }
} }
...@@ -517,10 +484,8 @@ static int pc87413_notify_sys(struct notifier_block *this, ...@@ -517,10 +484,8 @@ static int pc87413_notify_sys(struct notifier_block *this,
void *unused) void *unused)
{ {
if (code == SYS_DOWN || code == SYS_HALT) if (code == SYS_DOWN || code == SYS_HALT)
{
/* Turn the card off */ /* Turn the card off */
pc87413_disable(); pc87413_disable();
}
return NOTIFY_DONE; return NOTIFY_DONE;
} }
...@@ -530,18 +495,16 @@ static const struct file_operations pc87413_fops = { ...@@ -530,18 +495,16 @@ static const struct file_operations pc87413_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = pc87413_write, .write = pc87413_write,
.ioctl = pc87413_ioctl, .unlocked_ioctl = pc87413_ioctl,
.open = pc87413_open, .open = pc87413_open,
.release = pc87413_release, .release = pc87413_release,
}; };
static struct notifier_block pc87413_notifier = static struct notifier_block pc87413_notifier = {
{
.notifier_call = pc87413_notify_sys, .notifier_call = pc87413_notify_sys,
}; };
static struct miscdevice pc87413_miscdev= static struct miscdevice pc87413_miscdev = {
{
.minor = WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
.name = "watchdog", .name = "watchdog",
.fops = &pc87413_fops .fops = &pc87413_fops
...@@ -561,29 +524,26 @@ static int __init pc87413_init(void) ...@@ -561,29 +524,26 @@ static int __init pc87413_init(void)
{ {
int ret; int ret;
printk(KERN_INFO PFX "Version " VERSION " at io 0x%X\n", WDT_INDEX_IO_PORT); printk(KERN_INFO PFX "Version " VERSION " at io 0x%X\n",
WDT_INDEX_IO_PORT);
/* request_region(io, 2, "pc87413"); */ /* request_region(io, 2, "pc87413"); */
ret = register_reboot_notifier(&pc87413_notifier); ret = register_reboot_notifier(&pc87413_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);
} }
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;
} }
printk(KERN_INFO PFX "initialized. timeout=%d min \n", timeout); printk(KERN_INFO PFX "initialized. timeout=%d min \n", timeout);
pc87413_enable(); pc87413_enable();
return 0; return 0;
} }
...@@ -600,8 +560,7 @@ static int __init pc87413_init(void) ...@@ -600,8 +560,7 @@ static int __init pc87413_init(void)
static void __exit pc87413_exit(void) static void __exit pc87413_exit(void)
{ {
/* Stop the timer before we leave */ /* Stop the timer before we leave */
if (!nowayout) if (!nowayout) {
{
pc87413_disable(); pc87413_disable();
printk(KERN_INFO MODNAME "Watchdog disabled.\n"); printk(KERN_INFO MODNAME "Watchdog disabled.\n");
} }
...@@ -626,8 +585,12 @@ module_param(io, int, 0); ...@@ -626,8 +585,12 @@ module_param(io, int, 0);
MODULE_PARM_DESC(io, MODNAME " I/O port (default: " __MODULE_STRING(io) ")."); MODULE_PARM_DESC(io, MODNAME " I/O port (default: " __MODULE_STRING(io) ").");
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes (default=" __MODULE_STRING(timeout) ")."); MODULE_PARM_DESC(timeout,
"Watchdog timeout in minutes (default="
__MODULE_STRING(timeout) ").");
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) ")");
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或