X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4aac3b42a23c57e7e4076ee7805432995025a278..35a0fb9185194743f1d43c07dea98347e052a96a:/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c diff --git a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c index 271025008..2ae83e1cd 100644 --- a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c +++ b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c @@ -1,6 +1,6 @@ /* * linux/drivers/char/ar7_wdt.c - * + * * Copyright (C) 2007 OpenWrt.org * Copyright (c) 2005 Enrik Berkhan * @@ -12,12 +12,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -33,11 +33,10 @@ #include #include #include +#include +#include #include -#include -#include - #include #define DRVNAME "ar7_wdt" @@ -56,16 +55,19 @@ static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); -typedef struct { +#define READ_REG(x) readl((void __iomem *)&(x)) +#define WRITE_REG(x, v) writel((v), (void __iomem *)&(x)) + +struct ar7_wdt { u32 kick_lock; u32 kick; u32 change_lock; - u32 change ; + u32 change; u32 disable_lock; u32 disable; u32 prescale_lock; u32 prescale; -} ar7_wdt_t; +}; static struct semaphore open_semaphore; static unsigned expect_close; @@ -73,15 +75,14 @@ static unsigned expect_close; /* XXX currently fixed, allows max margin ~68.72 secs */ #define prescale_value 0xffff -// Offset of the WDT registers +/* Offset of the WDT registers */ static unsigned long ar7_regs_wdt; -// Pointer to the remapped WDT IO space -static ar7_wdt_t *ar7_wdt; +/* Pointer to the remapped WDT IO space */ +static struct ar7_wdt *ar7_wdt; static void ar7_wdt_get_regs(void) { u16 chip_id = ar7_chip_id(); - switch (chip_id) - { + switch (chip_id) { case AR7_CHIP_7100: case AR7_CHIP_7200: ar7_regs_wdt = AR7_REGS_WDT; @@ -92,13 +93,14 @@ static void ar7_wdt_get_regs(void) } } + static void ar7_wdt_kick(u32 value) { - ar7_wdt->kick_lock = 0x5555; - if ((ar7_wdt->kick_lock & 3) == 1) { - ar7_wdt->kick_lock = 0xaaaa; - if ((ar7_wdt->kick_lock & 3) == 3) { - ar7_wdt->kick = value; + WRITE_REG(ar7_wdt->kick_lock, 0x5555); + if ((READ_REG(ar7_wdt->kick_lock) & 3) == 1) { + WRITE_REG(ar7_wdt->kick_lock, 0xaaaa); + if ((READ_REG(ar7_wdt->kick_lock) & 3) == 3) { + WRITE_REG(ar7_wdt->kick, value); return; } } @@ -107,11 +109,11 @@ static void ar7_wdt_kick(u32 value) static void ar7_wdt_prescale(u32 value) { - ar7_wdt->prescale_lock = 0x5a5a; - if ((ar7_wdt->prescale_lock & 3) == 1) { - ar7_wdt->prescale_lock = 0xa5a5; - if ((ar7_wdt->prescale_lock & 3) == 3) { - ar7_wdt->prescale = value; + WRITE_REG(ar7_wdt->prescale_lock, 0x5a5a); + if ((READ_REG(ar7_wdt->prescale_lock) & 3) == 1) { + WRITE_REG(ar7_wdt->prescale_lock, 0xa5a5); + if ((READ_REG(ar7_wdt->prescale_lock) & 3) == 3) { + WRITE_REG(ar7_wdt->prescale, value); return; } } @@ -120,11 +122,11 @@ static void ar7_wdt_prescale(u32 value) static void ar7_wdt_change(u32 value) { - ar7_wdt->change_lock = 0x6666; - if ((ar7_wdt->change_lock & 3) == 1) { - ar7_wdt->change_lock = 0xbbbb; - if ((ar7_wdt->change_lock & 3) == 3) { - ar7_wdt->change = value; + WRITE_REG(ar7_wdt->change_lock, 0x6666); + if ((READ_REG(ar7_wdt->change_lock) & 3) == 1) { + WRITE_REG(ar7_wdt->change_lock, 0xbbbb); + if ((READ_REG(ar7_wdt->change_lock) & 3) == 3) { + WRITE_REG(ar7_wdt->change, value); return; } } @@ -133,13 +135,13 @@ static void ar7_wdt_change(u32 value) static void ar7_wdt_disable(u32 value) { - ar7_wdt->disable_lock = 0x7777; - if ((ar7_wdt->disable_lock & 3) == 1) { - ar7_wdt->disable_lock = 0xcccc; - if ((ar7_wdt->disable_lock & 3) == 2) { - ar7_wdt->disable_lock = 0xdddd; - if ((ar7_wdt->disable_lock & 3) == 3) { - ar7_wdt->disable = value; + WRITE_REG(ar7_wdt->disable_lock, 0x7777); + if ((READ_REG(ar7_wdt->disable_lock) & 3) == 1) { + WRITE_REG(ar7_wdt->disable_lock, 0xcccc); + if ((READ_REG(ar7_wdt->disable_lock) & 3) == 2) { + WRITE_REG(ar7_wdt->disable_lock, 0xdddd); + if ((READ_REG(ar7_wdt->disable_lock) & 3) == 3) { + WRITE_REG(ar7_wdt->disable, value); return; } } @@ -187,18 +189,20 @@ static int ar7_wdt_open(struct inode *inode, struct file *file) static int ar7_wdt_release(struct inode *inode, struct file *file) { - if (!expect_close) { - printk(KERN_WARNING DRVNAME ": watchdog device closed unexpectedly, will not disable the watchdog timer\n"); - } else if (!nowayout) { + if (!expect_close) + printk(KERN_WARNING DRVNAME + ": watchdog device closed unexpectedly," + "will not disable the watchdog timer\n"); + else if (!nowayout) ar7_wdt_disable_wdt(); - } + up(&open_semaphore); return 0; } -static int ar7_wdt_notify_sys(struct notifier_block *this, - unsigned long code, void *unused) +static int ar7_wdt_notify_sys(struct notifier_block *this, + unsigned long code, void *unused) { if (code == SYS_HALT || code == SYS_POWER_OFF) if (!nowayout) @@ -207,15 +211,14 @@ static int ar7_wdt_notify_sys(struct notifier_block *this, return NOTIFY_DONE; } -static struct notifier_block ar7_wdt_notifier = -{ +static struct notifier_block ar7_wdt_notifier = { .notifier_call = ar7_wdt_notify_sys }; -static ssize_t ar7_wdt_write(struct file *file, const char *data, - size_t len, loff_t *ppos) +static ssize_t ar7_wdt_write(struct file *file, const char *data, + size_t len, loff_t *ppos) { - if (ppos != &file->f_pos) + if (*ppos != file->f_pos) return -ESPIPE; /* check for a magic close character */ @@ -237,19 +240,21 @@ static ssize_t ar7_wdt_write(struct file *file, const char *data, return len; } -static int ar7_wdt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static int ar7_wdt_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) { static struct watchdog_info ident = { .identity = LONGNAME, - .firmware_version = 1, + .firmware_version = 1, .options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING), }; int new_margin; - + switch (cmd) { + default: + return -ENOTTY; case WDIOC_GETSUPPORT: - if(copy_to_user((struct watchdog_info *)arg, &ident, + if (copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident))) return -EFAULT; return 0; @@ -274,23 +279,21 @@ static int ar7_wdt_ioctl(struct inode *inode, struct file *file, if (put_user(margin, (int *)arg)) return -EFAULT; return 0; - default: - return -ENOTTY; } } static struct file_operations ar7_wdt_fops = { - .owner = THIS_MODULE, - .write = ar7_wdt_write, - .ioctl = ar7_wdt_ioctl, - .open = ar7_wdt_open, - .release = ar7_wdt_release, + .owner = THIS_MODULE, + .write = ar7_wdt_write, + .ioctl = ar7_wdt_ioctl, + .open = ar7_wdt_open, + .release = ar7_wdt_release, }; static struct miscdevice ar7_wdt_miscdev = { - .minor = WATCHDOG_MINOR, - .name = "watchdog", - .fops = &ar7_wdt_fops, + .minor = WATCHDOG_MINOR, + .name = "watchdog", + .fops = &ar7_wdt_fops, }; static int __init ar7_wdt_init(void) @@ -299,12 +302,14 @@ static int __init ar7_wdt_init(void) ar7_wdt_get_regs(); - if (!request_mem_region(ar7_regs_wdt, sizeof(ar7_wdt_t), LONGNAME)) { + if (!request_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt), + LONGNAME)) { printk(KERN_WARNING DRVNAME ": watchdog I/O region busy\n"); return -EBUSY; } - ar7_wdt = (ar7_wdt_t *)ioremap(ar7_regs_wdt, sizeof(ar7_wdt_t)); + ar7_wdt = (struct ar7_wdt *) + ioremap(ar7_regs_wdt, sizeof(struct ar7_wdt)); ar7_wdt_disable_wdt(); ar7_wdt_prescale(prescale_value); @@ -320,7 +325,8 @@ static int __init ar7_wdt_init(void) rc = register_reboot_notifier(&ar7_wdt_notifier); if (rc) { - printk(KERN_ERR DRVNAME ": unable to register reboot notifier\n"); + printk(KERN_ERR DRVNAME + ": unable to register reboot notifier\n"); goto out_register; } goto out; @@ -328,7 +334,7 @@ static int __init ar7_wdt_init(void) out_register: misc_deregister(&ar7_wdt_miscdev); out_alloc: - release_mem_region(ar7_regs_wdt, sizeof(ar7_wdt_t)); + release_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt)); out: return rc; } @@ -338,7 +344,7 @@ static void __exit ar7_wdt_cleanup(void) unregister_reboot_notifier(&ar7_wdt_notifier); misc_deregister(&ar7_wdt_miscdev); iounmap(ar7_wdt); - release_mem_region(ar7_regs_wdt, sizeof(ar7_wdt_t)); + release_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt)); } module_init(ar7_wdt_init);