Skip to content

L
linux
Commit 4dee5a24 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files
Options

[WATCHDOG] alim7101_wdt.c patch 

cleanup comments and trailing spaces
added extra printk's to report what problem occured
added MODULE_DESCRIPTION
parent 1b096dbf
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 52 deletions
drivers/char/watchdog/alim7101_wdt.c
View file @ 4dee5a24
/* /*
* ALi M7101 PMU Computer Watchdog Timer driver for Linux 2.4.x * ALi M7101 PMU Computer Watchdog Timer driver
* *
* Based on w83877f_wdt.c by Scott Jennings <management@oro.net> * Based on w83877f_wdt.c by Scott Jennings <linuxdrivers@oro.net>
* and the Cobalt kernel WDT timer driver by Tim Hockin * and the Cobalt kernel WDT timer driver by Tim Hockin
* <thockin@cobaltnet.com> * <thockin@cobaltnet.com>
* *
* (c)2002 Steve Hill <steve@navaho.co.uk> * (c)2002 Steve Hill <steve@navaho.co.uk>
* *
* Theory of operation:
* A Watchdog Timer (WDT) is a hardware circuit that can
* reset the computer system in case of a software fault.
* You probably knew that already.
*
* Usually a userspace daemon will notify the kernel WDT driver
* via the /proc/watchdog special device file that userspace is
* still alive, at regular intervals. When such a notification
* occurs, the driver will usually tell the hardware watchdog
* that everything is in order, and that the watchdog should wait
* for yet another little while to reset the system.
* If userspace fails (RAM error, kernel bug, whatever), the
* notifications cease to occur, and the hardware watchdog will
* reset the system (causing a reboot) after the timeout occurs.
*
* This WDT driver is different from most other Linux WDT * This WDT driver is different from most other Linux WDT
* drivers in that the driver will ping the watchdog by itself, * drivers in that the driver will ping the watchdog by itself,
* because this particular WDT has a very short timeout (1.6 * because this particular WDT has a very short timeout (1.6
...@@ -30,6 +15,7 @@ ...@@ -30,6 +15,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
...@@ -38,7 +24,6 @@ ...@@ -38,7 +24,6 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/moduleparam.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -46,6 +31,7 @@ ...@@ -46,6 +31,7 @@
#include <asm/system.h> #include <asm/system.h>
#define OUR_NAME "alim7101_wdt" #define OUR_NAME "alim7101_wdt"
#define PFX OUR_NAME ": "
#define WDT_ENABLE 0x9C #define WDT_ENABLE 0x9C
#define WDT_DISABLE 0x8C #define WDT_DISABLE 0x8C
...@@ -101,7 +87,7 @@ static void wdt_timer_ping(unsigned long data) ...@@ -101,7 +87,7 @@ static void wdt_timer_ping(unsigned long data)
pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp & ~ALI_WDT_ARM)); pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp & ~ALI_WDT_ARM));
pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp | ALI_WDT_ARM)); pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp | ALI_WDT_ARM));
} else { } else {
printk(KERN_INFO OUR_NAME ": Heartbeat lost! Will not ping the watchdog\n"); printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
} }
/* Re-set the timer interval */ /* Re-set the timer interval */
timer.expires = jiffies + WDT_INTERVAL; timer.expires = jiffies + WDT_INTERVAL;
...@@ -137,7 +123,7 @@ static void wdt_startup(void) ...@@ -137,7 +123,7 @@ static void wdt_startup(void)
add_timer(&timer); add_timer(&timer);
printk(KERN_INFO OUR_NAME ": Watchdog timer is now enabled.\n"); printk(KERN_INFO PFX "Watchdog timer is now enabled.\n");
} }
static void wdt_turnoff(void) static void wdt_turnoff(void)
...@@ -145,7 +131,7 @@ static void wdt_turnoff(void) ...@@ -145,7 +131,7 @@ static void wdt_turnoff(void)
/* Stop the timer */ /* Stop the timer */
del_timer_sync(&timer); del_timer_sync(&timer);
wdt_change(WDT_DISABLE); wdt_change(WDT_DISABLE);
printk(KERN_INFO OUR_NAME ": Watchdog timer is now disabled...\n"); printk(KERN_INFO PFX "Watchdog timer is now disabled...\n");
} }
/* /*
...@@ -173,14 +159,13 @@ static ssize_t fop_write(struct file * file, const char * buf, size_t count, lof ...@@ -173,14 +159,13 @@ static ssize_t fop_write(struct file * file, const char * buf, size_t count, lof
if (get_user(c, buf+ofs)) if (get_user(c, buf+ofs))
return -EFAULT; return -EFAULT;
if (c == 'V') if (c == 'V')
wdt_expect_close = 1; wdt_expect_close = 42;
} }
} }
/* someone wrote to us, we should restart timer */ /* someone wrote to us, we should restart timer */
next_heartbeat = jiffies + WDT_HEARTBEAT; next_heartbeat = jiffies + WDT_HEARTBEAT;
return 1; }
}; return count;
return 0;
} }
static int fop_open(struct inode * inode, struct file * file) static int fop_open(struct inode * inode, struct file * file)
...@@ -195,12 +180,13 @@ static int fop_open(struct inode * inode, struct file * file) ...@@ -195,12 +180,13 @@ static int fop_open(struct inode * inode, struct file * file)
static int fop_close(struct inode * inode, struct file * file) static int fop_close(struct inode * inode, struct file * file)
{ {
if(wdt_expect_close) if(wdt_expect_close == 42)
wdt_turnoff(); wdt_turnoff();
else else {
printk(KERN_INFO OUR_NAME ": device file closed unexpectedly. Will not stop the WDT!\n"); printk(KERN_CRIT PFX "device file closed unexpectedly. Will not stop the WDT!\n");
}
clear_bit(0, &wdt_is_open); clear_bit(0, &wdt_is_open);
wdt_expect_close = 0;
return 0; return 0;
} }
...@@ -210,7 +196,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u ...@@ -210,7 +196,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
{ {
.options = WDIOF_MAGICCLOSE, .options = WDIOF_MAGICCLOSE,
.firmware_version = 1, .firmware_version = 1,
.identity = "ALiM7101" .identity = "ALiM7101",
}; };
switch(cmd) switch(cmd)
...@@ -231,13 +217,13 @@ static struct file_operations wdt_fops = { ...@@ -231,13 +217,13 @@ static struct file_operations wdt_fops = {
.write= fop_write, .write= fop_write,
.open= fop_open, .open= fop_open,
.release= fop_close, .release= fop_close,
.ioctl= fop_ioctl .ioctl= fop_ioctl,
}; };
static struct miscdevice wdt_miscdev = { static struct miscdevice wdt_miscdev = {
.minor=WATCHDOG_MINOR, .minor=WATCHDOG_MINOR,
.name="watchdog", .name="watchdog",
.fops=&wdt_fops .fops=&wdt_fops,
}; };
/* /*
...@@ -256,7 +242,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, void ...@@ -256,7 +242,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, void
* reboot with no heartbeat * reboot with no heartbeat
*/ */
wdt_change(WDT_ENABLE); wdt_change(WDT_ENABLE);
printk(KERN_INFO OUR_NAME ": Watchdog timer is now enabled with no heartbeat - should reboot in ~1 second.\n"); printk(KERN_INFO PFX "Watchdog timer is now enabled with no heartbeat - should reboot in ~1 second.\n");
} }
return NOTIFY_DONE; return NOTIFY_DONE;
} }
...@@ -270,7 +256,7 @@ static struct notifier_block wdt_notifier= ...@@ -270,7 +256,7 @@ static struct notifier_block wdt_notifier=
{ {
.notifier_call = wdt_notify_sys, .notifier_call = wdt_notify_sys,
.next = 0, .next = 0,
.priority = 0 .priority = 0,
}; };
static void __exit alim7101_wdt_unload(void) static void __exit alim7101_wdt_unload(void)
...@@ -287,10 +273,10 @@ static int __init alim7101_wdt_init(void) ...@@ -287,10 +273,10 @@ static int __init alim7101_wdt_init(void)
struct pci_dev *ali1543_south; struct pci_dev *ali1543_south;
char tmp; char tmp;
printk(KERN_INFO OUR_NAME ": Steve Hill <steve@navaho.co.uk>.\n"); printk(KERN_INFO PFX "Steve Hill <steve@navaho.co.uk>.\n");
alim7101_pmu = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,NULL); alim7101_pmu = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,NULL);
if (!alim7101_pmu) { if (!alim7101_pmu) {
printk(KERN_INFO OUR_NAME ": ALi M7101 PMU not present - WDT not set\n"); printk(KERN_INFO PFX "ALi M7101 PMU not present - WDT not set\n");
return -EBUSY; return -EBUSY;
} }
...@@ -299,12 +285,12 @@ static int __init alim7101_wdt_init(void) ...@@ -299,12 +285,12 @@ static int __init alim7101_wdt_init(void)
ali1543_south = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL); ali1543_south = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
if (!ali1543_south) { if (!ali1543_south) {
printk(KERN_INFO OUR_NAME ": ALi 1543 South-Bridge not present - WDT not set\n"); printk(KERN_INFO PFX "ALi 1543 South-Bridge not present - WDT not set\n");
return -EBUSY; return -EBUSY;
} }
pci_read_config_byte(ali1543_south, 0x5e, &tmp); pci_read_config_byte(ali1543_south, 0x5e, &tmp);
if ((tmp & 0x1e) != 0x12) { if ((tmp & 0x1e) != 0x12) {
printk(KERN_INFO OUR_NAME ": ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n"); printk(KERN_INFO PFX "ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n");
return -EBUSY; return -EBUSY;
} }
...@@ -313,21 +299,32 @@ static int __init alim7101_wdt_init(void) ...@@ -313,21 +299,32 @@ static int __init alim7101_wdt_init(void)
timer.data = 1; timer.data = 1;
rc = misc_register(&wdt_miscdev); rc = misc_register(&wdt_miscdev);
if (rc) if (rc) {
return rc; printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
wdt_miscdev.minor, rc);
goto err_out;
}
rc = register_reboot_notifier(&wdt_notifier); rc = register_reboot_notifier(&wdt_notifier);
if (rc) { if (rc) {
misc_deregister(&wdt_miscdev); printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
return rc; rc);
goto err_out_miscdev;
} }
printk(KERN_INFO OUR_NAME ": WDT driver for ALi M7101 initialised.\n"); printk(KERN_INFO PFX "WDT driver for ALi M7101 initialised. (nowayout=%d)\n",
nowayout);
return 0; return 0;
err_out_miscdev:
misc_deregister(&wdt_miscdev);
err_out:
return rc;
} }
module_init(alim7101_wdt_init); module_init(alim7101_wdt_init);
module_exit(alim7101_wdt_unload); module_exit(alim7101_wdt_unload);
MODULE_AUTHOR("Steve Hill"); MODULE_AUTHOR("Steve Hill");
MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
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