qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-10 15:47:11 +02:00
Code

cleanup watchdog

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3666 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2006-04-17 18:39:32 +00:00
parent 7d4f5a1aef
commit 69de0f2992
1 changed files with 59 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
openwrt/target/linux/aruba-2.6/patches/004-wdt.patch
View File

@ -1,7 +1,7 @@
diff -Nur linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c linux-2.6.15.1-openwrt/drivers/char/watchdog/wdt_merlot.c diff -Nur linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c linux-2.6.15.1-openwrt/drivers/char/watchdog/wdt_merlot.c
--- linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c 2006-01-26 21:14:02.204626250 -0800 --- linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c 2006-01-26 21:14:02.204626250 -0800
+++ linux-2.6.15.1-openwrt/drivers/char/watchdog/wdt_merlot.c 2006-02-02 20:31:43.000000000 -0800 +++ linux-2.6.15.1-openwrt/drivers/char/watchdog/wdt_merlot.c 2006-02-02 20:31:43.000000000 -0800
@@ -0,0 +1,141 @@ @@ -0,0 +1,110 @@
+#include <linux/config.h> +#include <linux/config.h>
+#include <linux/module.h> +#include <linux/module.h>
+#include <linux/types.h> +#include <linux/types.h>
@ -14,66 +14,35 @@ diff -Nur linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c linux-2.6.15.1-openw
+#include <asm/system.h> +#include <asm/system.h>
+#include <asm/bootinfo.h> +#include <asm/bootinfo.h>
+ +
+// refresh the watchdog timer for this many seconds in kernel
+// before letting the watchdog process take over.
+#define WDT_COUNT 60
+
+extern unsigned long mips_machtype; +extern unsigned long mips_machtype;
+ +
+static unsigned long wdt_is_open; +static unsigned long wdt_is_open;
+static struct timer_list wdt_timer; +static struct timer_list wdt_timer;
+static int wdt_count = WDT_COUNT;
+ +
+static void wdt_merlot_refresh(void){ +static void wdt_merlot_refresh(void)
+{
+ volatile __u32 *wdt; + volatile __u32 *wdt;
+ switch (mips_machtype) { + switch (mips_machtype) {
+ case MACH_ARUBA_AP70: + case MACH_ARUBA_AP70:
+ wdt = (__u32 *)0xb8030034; + wdt = (__u32 *) 0xb8030034;
+ *wdt = 0x10000000; + *wdt = 0x10000000;
+ break; + break;
+ default: + default:
+ wdt = (__u32 *)0xbc00300c; + wdt = (__u32 *) 0xbc00300c;
+ *wdt = 0x40000000; + *wdt = 0x40000000;
+ break; + break;
+ } + }
+} +}
+ +
+static void wdt_merlot_disable() +static void wdt_merlot_timer_fn(unsigned long data)
+{ +{
+ volatile __u32 *wdt_errcs;
+ volatile __u32 *wdt_wtc;
+ volatile __u32 *wdt_ctl;
+ volatile __u32 val ;
+
+ switch (mips_machtype) {
+ case MACH_ARUBA_AP70:
+ wdt_errcs = (__u32 *)0xb8030030 ;
+ wdt_wtc = (__u32 *)0xb803003c ;
+ val = *wdt_errcs ;
+ val &= ~0x201 ;
+ *wdt_errcs = val ;
+ val = *wdt_wtc ;
+ val &= ~0x1 ;
+ *wdt_wtc = val ;
+ break;
+ default:
+ wdt_ctl = (__u32 *)0xbc003008;
+ *wdt_ctl = 0 ;
+ break;
+ }
+}
+
+static void wdt_merlot_timer_fn(unsigned long data){
+
+ wdt_merlot_refresh(); + wdt_merlot_refresh();
+ if (--wdt_count >= 0) + if (!test_bit(1, &wdt_is_open))
+ mod_timer(&wdt_timer, jiffies + HZ); + mod_timer(&wdt_timer, jiffies + HZ);
+ else
+ wdt_merlot_disable();
+
+} +}
+ +
+static int wdt_merlot_setup_timer(void){ +static int wdt_merlot_setup_timer(void)
+{
+ +
+ init_timer(&wdt_timer); + init_timer(&wdt_timer);
+ wdt_timer.function = wdt_merlot_timer_fn; + wdt_timer.function = wdt_merlot_timer_fn;
@ -85,17 +54,16 @@ diff -Nur linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c linux-2.6.15.1-openw
+ +
+static int wdt_open(struct inode *inode, struct file *file) +static int 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;
+ wdt_count=0; + set_bit(1, &wdt_is_open);
+ return nonseekable_open(inode, file); + return nonseekable_open(inode, file);
+} +}
+ +
+static ssize_t wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) +static ssize_t wdt_write(struct file *file, const char __user * buf, size_t count, loff_t * ppos)
+{ +{
+ if (count) { /* something was written */ + if (count) /* something was written */
+ wdt_merlot_refresh(); + wdt_merlot_refresh();
+ }
+ return count; + return count;
+} +}
+ +
@ -129,7 +97,8 @@ diff -Nur linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c linux-2.6.15.1-openw
+ int ret; + int ret;
+ ret = misc_register(&wdt_miscdev); + ret = misc_register(&wdt_miscdev);
+ if (ret) { + if (ret) {
+ printk(KERN_ERR "wdt: cannot register miscdev on minor=%d (err=%d)\n", + printk(KERN_ERR
+ "wdt: cannot register miscdev on minor=%d (err=%d)\n",
+ WATCHDOG_MINOR, ret); + WATCHDOG_MINOR, ret);
+ misc_deregister(&wdt_miscdev); + misc_deregister(&wdt_miscdev);
+ goto out; + goto out;
@ -137,7 +106,7 @@ diff -Nur linux-2.6.15.1/drivers/char/watchdog/wdt_merlot.c linux-2.6.15.1-openw
+ printk("wdt: registered with refresh\n"); + printk("wdt: registered with refresh\n");
+ wdt_merlot_refresh(); + wdt_merlot_refresh();
+ wdt_merlot_setup_timer(); + wdt_merlot_setup_timer();
+out: + out:
+ return ret; + return ret;
+} +}
+ +