hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: hpwdt (12/12): Make NMI decoding a compile-time option
  watchdog: hpwdt (11/12): move NMI-decoding init and exit to seperate functions
  watchdog: hpwdt (10/12): Use "decoding" instead of "sourcing"
  watchdog: hpwdt (9/12): hpwdt_pretimeout reorganization
  watchdog: hpwdt (8/12): implement WDIOC_GETTIMELEFT
  watchdog: hpwdt (7/12): allow full range of timer values supported by hardware
  watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macro
  watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict
  watchdog: hpwdt (4/12): Despecificate driver from iLO2
  watchdog: hpwdt (3/12): Group NMI sourcing specific items together
  watchdog: hpwdt (2/12): Group options that affect watchdog behavior together
  watchdog: hpwdt (1/12): clean-up include-files.
This commit is contained in:
Linus Torvalds 2010-08-13 17:58:54 -07:00
parent 9a459f6812 86ded1f35d
commit 7ec3fa1f4a
2 changed files with 185 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/watchdog/Kconfig
View File

@ -574,16 +574,21 @@ config IT87_WDT
be called it87_wdt. be called it87_wdt.
config HP_WATCHDOG config HP_WATCHDOG
tristate "HP Proliant iLO 2 Hardware Watchdog Timer" tristate "HP Proliant iLO2+ Hardware Watchdog Timer"
depends on X86 depends on X86
help help
A software monitoring watchdog and NMI sourcing driver. This driver A software monitoring watchdog and NMI sourcing driver. This driver
will detect lockups and provide stack trace. Also, when an NMI will detect lockups and provide a stack trace. This is a driver that
occurs this driver will make the necessary BIOS calls to log will only load on a HP ProLiant system with a minimum of iLO2 support.
the cause of the NMI. This is a driver that will only load on a To compile this driver as a module, choose M here: the module will be
HP ProLiant system with a minimum of iLO2 support. called hpwdt.
To compile this driver as a module, choose M here: the
module will be called hpwdt. config HPWDT_NMI_DECODING
bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
depends on HP_WATCHDOG
help
When an NMI occurs this feature will make the necessary BIOS calls to
log the cause of the NMI.
config SC1200_WDT config SC1200_WDT
tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog" tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"

304
drivers/watchdog/hpwdt.c
View File

@ -16,38 +16,55 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/bitops.h>
#include <linux/nmi.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/mm.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kdebug.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/notifier.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <linux/reboot.h>
#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#ifdef CONFIG_HPWDT_NMI_DECODING
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/efi.h> #include <linux/spinlock.h>
#include <linux/string.h> #include <linux/nmi.h>
#include <linux/bootmem.h> #include <linux/kdebug.h>
#include <asm/desc.h> #include <linux/notifier.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#endif /* CONFIG_HPWDT_NMI_DECODING */
#define HPWDT_VERSION "1.2.0"
#define SECS_TO_TICKS(secs) ((secs) * 1000 / 128)
#define TICKS_TO_SECS(ticks) ((ticks) * 128 / 1000)
#define HPWDT_MAX_TIMER TICKS_TO_SECS(65535)
#define DEFAULT_MARGIN 30
static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */
static unsigned int reload; /* the computed soft_margin */
static int nowayout = WATCHDOG_NOWAYOUT;
static char expect_release;
static unsigned long hpwdt_is_open;
static void __iomem *pci_mem_addr; /* the PCI-memory address */
static unsigned long __iomem *hpwdt_timer_reg;
static unsigned long __iomem *hpwdt_timer_con;
static struct pci_device_id hpwdt_devices[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) }, /* iLO2 */
{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) }, /* iLO3 */
{0}, /* terminate list */
};
MODULE_DEVICE_TABLE(pci, hpwdt_devices);
#ifdef CONFIG_HPWDT_NMI_DECODING
#define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */ #define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */
#define CRU_BIOS_SIGNATURE_VALUE 0x55524324 #define CRU_BIOS_SIGNATURE_VALUE 0x55524324
#define PCI_BIOS32_PARAGRAPH_LEN 16 #define PCI_BIOS32_PARAGRAPH_LEN 16
#define PCI_ROM_BASE1 0x000F0000 #define PCI_ROM_BASE1 0x000F0000
#define ROM_SIZE 0x10000 #define ROM_SIZE 0x10000
#define HPWDT_VERSION "1.1.1"
struct bios32_service_dir { struct bios32_service_dir {
u32 signature; u32 signature;
@ -112,37 +129,17 @@ struct cmn_registers {
u32 reflags; u32 reflags;
} __attribute__((packed)); } __attribute__((packed));
#define DEFAULT_MARGIN 30 static unsigned int hpwdt_nmi_decoding;
static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */
static unsigned int reload; /* the computed soft_margin */
static int nowayout = WATCHDOG_NOWAYOUT;
static char expect_release;
static unsigned long hpwdt_is_open;
static unsigned int allow_kdump; static unsigned int allow_kdump;
static unsigned int hpwdt_nmi_sourcing;
static unsigned int priority; /* hpwdt at end of die_notify list */ static unsigned int priority; /* hpwdt at end of die_notify list */
static void __iomem *pci_mem_addr; /* the PCI-memory address */
static unsigned long __iomem *hpwdt_timer_reg;
static unsigned long __iomem *hpwdt_timer_con;
static DEFINE_SPINLOCK(rom_lock); static DEFINE_SPINLOCK(rom_lock);
static void *cru_rom_addr; static void *cru_rom_addr;
static struct cmn_registers cmn_regs; static struct cmn_registers cmn_regs;
static struct pci_device_id hpwdt_devices[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },
{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },
{0}, /* terminate list */
};
MODULE_DEVICE_TABLE(pci, hpwdt_devices);
extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
unsigned long *pRomEntry); unsigned long *pRomEntry);
#ifndef CONFIG_X86_64 #ifdef CONFIG_X86_32
/* --32 Bit Bios------------------------------------------------------------ */ /* --32 Bit Bios------------------------------------------------------------ */
#define HPWDT_ARCH 32 #define HPWDT_ARCH 32
@ -331,8 +328,9 @@ static int __devinit detect_cru_service(void)
iounmap(p); iounmap(p);
return rc; return rc;
} }
/* ------------------------------------------------------------------------- */
#else #endif /* CONFIG_X86_32 */
#ifdef CONFIG_X86_64
/* --64 Bit Bios------------------------------------------------------------ */ /* --64 Bit Bios------------------------------------------------------------ */
#define HPWDT_ARCH 64 #define HPWDT_ARCH 64
@ -410,17 +408,16 @@ static int __devinit detect_cru_service(void)
/* if cru_rom_addr has been set then we found a CRU service */ /* if cru_rom_addr has been set then we found a CRU service */
return ((cru_rom_addr != NULL) ? 0 : -ENODEV); return ((cru_rom_addr != NULL) ? 0 : -ENODEV);
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#endif /* CONFIG_X86_64 */
#endif #endif /* CONFIG_HPWDT_NMI_DECODING */
/* /*
* Watchdog operations * Watchdog operations
*/ */
static void hpwdt_start(void) static void hpwdt_start(void)
{ {
reload = (soft_margin * 1000) / 128; reload = SECS_TO_TICKS(soft_margin);
iowrite16(reload, hpwdt_timer_reg); iowrite16(reload, hpwdt_timer_reg);
iowrite16(0x85, hpwdt_timer_con); iowrite16(0x85, hpwdt_timer_con);
} }
@ -441,8 +438,7 @@ static void hpwdt_ping(void)
static int hpwdt_change_timer(int new_margin) static int hpwdt_change_timer(int new_margin)
{ {
/* Arbitrary, can't find the card's limits */ if (new_margin < 1 || new_margin > HPWDT_MAX_TIMER) {
if (new_margin < 5 || new_margin > 600) {
printk(KERN_WARNING printk(KERN_WARNING
"hpwdt: New value passed in is invalid: %d seconds.\n", "hpwdt: New value passed in is invalid: %d seconds.\n",
new_margin); new_margin);
@ -453,11 +449,17 @@ static int hpwdt_change_timer(int new_margin)
printk(KERN_DEBUG printk(KERN_DEBUG
"hpwdt: New timer passed in is %d seconds.\n", "hpwdt: New timer passed in is %d seconds.\n",
new_margin); new_margin);
reload = (soft_margin * 1000) / 128; reload = SECS_TO_TICKS(soft_margin);
return 0; return 0;
} }
static int hpwdt_time_left(void)
{
return TICKS_TO_SECS(ioread16(hpwdt_timer_reg));
}
#ifdef CONFIG_HPWDT_NMI_DECODING
/* /*
* NMI Handler * NMI Handler
*/ */
@ -468,26 +470,29 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
static int die_nmi_called; static int die_nmi_called;
if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
return NOTIFY_OK; goto out;
if (hpwdt_nmi_sourcing) { if (!hpwdt_nmi_decoding)
spin_lock_irqsave(&rom_lock, rom_pl); goto out;
if (!die_nmi_called)
asminline_call(&cmn_regs, cru_rom_addr); spin_lock_irqsave(&rom_lock, rom_pl);
die_nmi_called = 1; if (!die_nmi_called)
spin_unlock_irqrestore(&rom_lock, rom_pl); asminline_call(&cmn_regs, cru_rom_addr);
if (cmn_regs.u1.ral == 0) { die_nmi_called = 1;
printk(KERN_WARNING "hpwdt: An NMI occurred, " spin_unlock_irqrestore(&rom_lock, rom_pl);
"but unable to determine source.\n"); if (cmn_regs.u1.ral == 0) {
} else { printk(KERN_WARNING "hpwdt: An NMI occurred, "
if (allow_kdump) "but unable to determine source.\n");
hpwdt_stop(); } else {
panic("An NMI occurred, please see the Integrated " if (allow_kdump)
"Management Log for details.\n"); hpwdt_stop();
} panic("An NMI occurred, please see the Integrated "
"Management Log for details.\n");
} }
out:
return NOTIFY_OK; return NOTIFY_OK;
} }
#endif /* CONFIG_HPWDT_NMI_DECODING */
/* /*
* /dev/watchdog handling * /dev/watchdog handling
@ -557,7 +562,7 @@ static const struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT | .options = WDIOF_SETTIMEOUT |
WDIOF_KEEPALIVEPING | WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE, WDIOF_MAGICCLOSE,
.identity = "HP iLO2 HW Watchdog Timer", .identity = "HP iLO2+ HW Watchdog Timer",
}; };
static long hpwdt_ioctl(struct file *file, unsigned int cmd, static long hpwdt_ioctl(struct file *file, unsigned int cmd,
@ -599,6 +604,10 @@ static long hpwdt_ioctl(struct file *file, unsigned int cmd,
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
ret = put_user(soft_margin, p); ret = put_user(soft_margin, p);
break; break;
case WDIOC_GETTIMELEFT:
ret = put_user(hpwdt_time_left(), p);
break;
} }
return ret; return ret;
} }
@ -621,79 +630,44 @@ static struct miscdevice hpwdt_miscdev = {
.fops = &hpwdt_fops, .fops = &hpwdt_fops,
}; };
#ifdef CONFIG_HPWDT_NMI_DECODING
static struct notifier_block die_notifier = { static struct notifier_block die_notifier = {
.notifier_call = hpwdt_pretimeout, .notifier_call = hpwdt_pretimeout,
.priority = 0, .priority = 0,
}; };
#endif /* CONFIG_HPWDT_NMI_DECODING */
/* /*
* Init & Exit * Init & Exit
*/ */
#ifdef CONFIG_HPWDT_NMI_DECODING
#ifdef ARCH_HAS_NMI_WATCHDOG #ifdef ARCH_HAS_NMI_WATCHDOG
static void __devinit hpwdt_check_nmi_sourcing(struct pci_dev *dev) static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
{ {
/* /*
* If nmi_watchdog is turned off then we can turn on * If nmi_watchdog is turned off then we can turn on
* our nmi sourcing capability. * our nmi decoding capability.
*/ */
if (!nmi_watchdog_active()) if (!nmi_watchdog_active())
hpwdt_nmi_sourcing = 1; hpwdt_nmi_decoding = 1;
else else
dev_warn(&dev->dev, "NMI sourcing is disabled. To enable this " dev_warn(&dev->dev, "NMI decoding is disabled. To enable this "
"functionality you must reboot with nmi_watchdog=0 " "functionality you must reboot with nmi_watchdog=0 "
"and load the hpwdt driver with priority=1.\n"); "and load the hpwdt driver with priority=1.\n");
} }
#else #else
static void __devinit hpwdt_check_nmi_sourcing(struct pci_dev *dev) static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
{ {
dev_warn(&dev->dev, "NMI sourcing is disabled. " dev_warn(&dev->dev, "NMI decoding is disabled. "
"Your kernel does not support a NMI Watchdog.\n"); "Your kernel does not support a NMI Watchdog.\n");
} }
#endif #endif /* ARCH_HAS_NMI_WATCHDOG */
static int __devinit hpwdt_init_one(struct pci_dev *dev, static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)
const struct pci_device_id *ent)
{ {
int retval; int retval;
/*
* Check if we can do NMI sourcing or not
*/
hpwdt_check_nmi_sourcing(dev);
/*
* First let's find out if we are on an iLO2 server. We will
* not run on a legacy ASM box.
* So we only support the G5 ProLiant servers and higher.
*/
if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
dev_warn(&dev->dev,
"This server does not have an iLO2 ASIC.\n");
return -ENODEV;
}
if (pci_enable_device(dev)) {
dev_warn(&dev->dev,
"Not possible to enable PCI Device: 0x%x:0x%x.\n",
ent->vendor, ent->device);
return -ENODEV;
}
pci_mem_addr = pci_iomap(dev, 1, 0x80);
if (!pci_mem_addr) {
dev_warn(&dev->dev,
"Unable to detect the iLO2 server memory.\n");
retval = -ENOMEM;
goto error_pci_iomap;
}
hpwdt_timer_reg = pci_mem_addr + 0x70;
hpwdt_timer_con = pci_mem_addr + 0x72;
/* Make sure that we have a valid soft_margin */
if (hpwdt_change_timer(soft_margin))
hpwdt_change_timer(DEFAULT_MARGIN);
/* /*
* We need to map the ROM to get the CRU service. * We need to map the ROM to get the CRU service.
* For 32 bit Operating Systems we need to go through the 32 Bit * For 32 bit Operating Systems we need to go through the 32 Bit
@ -705,7 +679,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
dev_warn(&dev->dev, dev_warn(&dev->dev,
"Unable to detect the %d Bit CRU Service.\n", "Unable to detect the %d Bit CRU Service.\n",
HPWDT_ARCH); HPWDT_ARCH);
goto error_get_cru; return retval;
} }
/* /*
@ -728,9 +702,87 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
dev_warn(&dev->dev, dev_warn(&dev->dev,
"Unable to register a die notifier (err=%d).\n", "Unable to register a die notifier (err=%d).\n",
retval); retval);
goto error_die_notifier; if (cru_rom_addr)
iounmap(cru_rom_addr);
} }
dev_info(&dev->dev,
"HP Watchdog Timer Driver: NMI decoding initialized"
", allow kernel dump: %s (default = 0/OFF)"
", priority: %s (default = 0/LAST).\n",
(allow_kdump == 0) ? "OFF" : "ON",
(priority == 0) ? "LAST" : "FIRST");
return 0;
}
static void __devexit hpwdt_exit_nmi_decoding(void)
{
unregister_die_notifier(&die_notifier);
if (cru_rom_addr)
iounmap(cru_rom_addr);
}
#else /* !CONFIG_HPWDT_NMI_DECODING */
static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
{
}
static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)
{
return 0;
}
static void __devexit hpwdt_exit_nmi_decoding(void)
{
}
#endif /* CONFIG_HPWDT_NMI_DECODING */
static int __devinit hpwdt_init_one(struct pci_dev *dev,
const struct pci_device_id *ent)
{
int retval;
/*
* Check if we can do NMI decoding or not
*/
hpwdt_check_nmi_decoding(dev);
/*
* First let's find out if we are on an iLO2+ server. We will
* not run on a legacy ASM box.
* So we only support the G5 ProLiant servers and higher.
*/
if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
dev_warn(&dev->dev,
"This server does not have an iLO2+ ASIC.\n");
return -ENODEV;
}
if (pci_enable_device(dev)) {
dev_warn(&dev->dev,
"Not possible to enable PCI Device: 0x%x:0x%x.\n",
ent->vendor, ent->device);
return -ENODEV;
}
pci_mem_addr = pci_iomap(dev, 1, 0x80);
if (!pci_mem_addr) {
dev_warn(&dev->dev,
"Unable to detect the iLO2+ server memory.\n");
retval = -ENOMEM;
goto error_pci_iomap;
}
hpwdt_timer_reg = pci_mem_addr + 0x70;
hpwdt_timer_con = pci_mem_addr + 0x72;
/* Make sure that we have a valid soft_margin */
if (hpwdt_change_timer(soft_margin))
hpwdt_change_timer(DEFAULT_MARGIN);
/* Initialize NMI Decoding functionality */
retval = hpwdt_init_nmi_decoding(dev);
if (retval != 0)
goto error_init_nmi_decoding;
retval = misc_register(&hpwdt_miscdev); retval = misc_register(&hpwdt_miscdev);
if (retval < 0) { if (retval < 0) {
dev_warn(&dev->dev, dev_warn(&dev->dev,
@ -739,23 +791,14 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
goto error_misc_register; goto error_misc_register;
} }
printk(KERN_INFO dev_info(&dev->dev, "HP Watchdog Timer Driver: %s"
"hp Watchdog Timer Driver: %s" ", timer margin: %d seconds (nowayout=%d).\n",
", timer margin: %d seconds (nowayout=%d)" HPWDT_VERSION, soft_margin, nowayout);
", allow kernel dump: %s (default = 0/OFF)"
", priority: %s (default = 0/LAST).\n",
HPWDT_VERSION, soft_margin, nowayout,
(allow_kdump == 0) ? "OFF" : "ON",
(priority == 0) ? "LAST" : "FIRST");
return 0; return 0;
error_misc_register: error_misc_register:
unregister_die_notifier(&die_notifier); hpwdt_exit_nmi_decoding();
error_die_notifier: error_init_nmi_decoding:
if (cru_rom_addr)
iounmap(cru_rom_addr);
error_get_cru:
pci_iounmap(dev, pci_mem_addr); pci_iounmap(dev, pci_mem_addr);
error_pci_iomap: error_pci_iomap:
pci_disable_device(dev); pci_disable_device(dev);
@ -768,10 +811,7 @@ static void __devexit hpwdt_exit(struct pci_dev *dev)
hpwdt_stop(); hpwdt_stop();
misc_deregister(&hpwdt_miscdev); misc_deregister(&hpwdt_miscdev);
unregister_die_notifier(&die_notifier); hpwdt_exit_nmi_decoding();
if (cru_rom_addr)
iounmap(cru_rom_addr);
pci_iounmap(dev, pci_mem_addr); pci_iounmap(dev, pci_mem_addr);
pci_disable_device(dev); pci_disable_device(dev);
} }
@ -802,16 +842,18 @@ MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
module_param(soft_margin, int, 0); module_param(soft_margin, int, 0);
MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
module_param(allow_kdump, int, 0);
MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs");
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
#ifdef CONFIG_HPWDT_NMI_DECODING
module_param(allow_kdump, int, 0);
MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs");
module_param(priority, int, 0); module_param(priority, int, 0);
MODULE_PARM_DESC(priority, "The hpwdt driver handles NMIs first or last" MODULE_PARM_DESC(priority, "The hpwdt driver handles NMIs first or last"
" (default = 0/Last)\n"); " (default = 0/Last)\n");
#endif /* !CONFIG_HPWDT_NMI_DECODING */
module_init(hpwdt_init); module_init(hpwdt_init);
module_exit(hpwdt_cleanup); module_exit(hpwdt_cleanup);