Commit b6ef977b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 4
  [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 3
  [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 2
  [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 1
  [WATCHDOG] MIPS RM9000 on-chip watchdog device
  [WATCHDOG] Add iTCO vendor specific support
  [WATCHDOG] sc1200wdt.c pnp unregister fix.
  [WATCHDOG] config.h removal
  [WATCHDOG] NS pc87413-wdt Watchdog driver - fixes
  [WATCHDOG] NS pc87413-wdt Watchdog driver v1.1
  [WATCHDOG] NS pc87413-wdt Watchdog driver
parents 9ba5aa31 bdbf77d6

drivers/char/watchdog/Kconfig

+32 −0
Original line number Diff line number Diff line
@@ -340,6 +340,14 @@ config ITCO_WDT 
	  To compile this driver as a module, choose M here: the

	  module will be called iTCO_wdt.



config ITCO_VENDOR_SUPPORT

	bool "Intel TCO Timer/Watchdog Specific Vendor Support"

	depends on ITCO_WDT

	---help---

	  Add vendor specific support to the intel TCO timer based watchdog

	  devices. At this moment we only have additional support for some

	  SuperMicro Inc. motherboards.



config SC1200_WDT

	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"

	depends on WATCHDOG && X86
@@ -363,6 +371,20 @@ config SCx200_WDT 


	  If compiled as a module, it will be called scx200_wdt.



config PC87413_WDT

	tristate "NS PC87413 watchdog"

	depends on WATCHDOG && X86

	---help---

	  This is the driver for the hardware watchdog on the PC87413 chipset

	  This watchdog simply watches your kernel to make sure it doesn't

	  freeze, and if it does, it reboots your computer after a certain

	  amount of time.



	  To compile this driver as a module, choose M here: the

	  module will be called pc87413_wdt.



	  Most people will say N.

 

config 60XX_WDT

	tristate "SBC-60XX Watchdog Timer"

	depends on WATCHDOG && X86
@@ -553,6 +575,16 @@ config INDYDOG 
	  timer expired and no process has written to /dev/watchdog during

	  that time.



config WDT_RM9K_GPI

	tristate "RM9000/GPI hardware watchdog"

	depends on WATCHDOG && CPU_RM9000

	help

	  Watchdog implementation using the GPI hardware found on

	  PMC-Sierra RM9xxx CPUs.



	  To compile this driver as a module, choose M here: the

	  module will be called rm9k_wdt.



# S390 Architecture



config ZVM_WATCHDOG

drivers/char/watchdog/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -47,9 +47,10 @@ obj-$(CONFIG_IBMASR) += ibmasr.o 
obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o

obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o

obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o

obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o

obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o

obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o

obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o

obj-$(CONFIG_SBC8360_WDT) += sbc8360.o

obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
@@ -72,6 +73,7 @@ obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o 


# MIPS Architecture

obj-$(CONFIG_INDYDOG) += indydog.o

obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o



# S390 Architecture

drivers/char/watchdog/iTCO_vendor_support.c

0 → 100644
+307 −0
Original line number Diff line number Diff line 
/*

 *	intel TCO vendor specific watchdog driver support

 *

 *	(c) Copyright 2006 Wim Van Sebroeck <wim@iguana.be>.

 *

 *	This program is free software; you can redistribute it and/or

 *	modify 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.

 *

 *	Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor

 *	provide warranty for any of this software. This material is

 *	provided "AS-IS" and at no charge.

 */



/*

 *	Includes, defines, variables, module parameters, ...

 */



/* Module and version information */

#define DRV_NAME        "iTCO_vendor_support"

#define DRV_VERSION     "1.01"

#define DRV_RELDATE     "11-Nov-2006"

#define PFX		DRV_NAME ": "



/* Includes */

#include <linux/module.h>		/* For module specific items */

#include <linux/moduleparam.h>		/* For new moduleparam's */

#include <linux/types.h>		/* For standard types (like size_t) */

#include <linux/errno.h>		/* For the -ENODEV/... values */

#include <linux/kernel.h>		/* For printk/panic/... */

#include <linux/init.h>			/* For __init/__exit/... */

#include <linux/ioport.h>		/* For io-port access */



#include <asm/io.h>			/* For inb/outb/... */



/* iTCO defines */

#define	SMI_EN		acpibase + 0x30	/* SMI Control and Enable Register */

#define	TCOBASE		acpibase + 0x60	/* TCO base address		*/

#define	TCO1_STS	TCOBASE + 0x04	/* TCO1 Status Register		*/



/* List of vendor support modes */

#define SUPERMICRO_OLD_BOARD	1	/* SuperMicro Pentium 3 Era 370SSE+-OEM1/P3TSSE */

#define SUPERMICRO_NEW_BOARD	2	/* SuperMicro Pentium 4 / Xeon 4 / EMT64T Era Systems */



static int vendorsupport = 0;

module_param(vendorsupport, int, 0);

MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (none), 1=SuperMicro Pent3, 2=SuperMicro Pent4+");



/*

 *	Vendor Specific Support

 */



/*

 *	Vendor Support: 1

 *	Board: Super Micro Computer Inc. 370SSE+-OEM1/P3TSSE

 *	iTCO chipset: ICH2

 *

 *	Code contributed by: R. Seretny <lkpatches@paypc.com>

 *	Documentation obtained by R. Seretny from SuperMicro Technical Support

 *

 *	To enable Watchdog function:

 *	    BIOS setup -> Power -> TCO Logic SMI Enable -> Within5Minutes

 *	    This setting enables SMI to clear the watchdog expired flag.

 *	    If BIOS or CPU fail which may cause SMI hang, then system will

 *	    reboot. When application starts to use watchdog function,

 *	    application has to take over the control from SMI.

 *

 *	    For P3TSSE, J36 jumper needs to be removed to enable the Watchdog

 *	    function.

 *

 *	    Note: The system will reboot when Expire Flag is set TWICE.

 *	    So, if the watchdog timer is 20 seconds, then the maximum hang

 *	    time is about 40 seconds, and the minimum hang time is about

 *	    20.6 seconds.

 */



static void supermicro_old_pre_start(unsigned long acpibase)

{

	unsigned long val32;



	val32 = inl(SMI_EN);

	val32 &= 0xffffdfff;	/* Turn off SMI clearing watchdog */

	outl(val32, SMI_EN);	/* Needed to activate watchdog */

}



static void supermicro_old_pre_stop(unsigned long acpibase)

{

	unsigned long val32;



	val32 = inl(SMI_EN);

	val32 &= 0x00002000;	/* Turn on SMI clearing watchdog */

	outl(val32, SMI_EN);	/* Needed to deactivate watchdog */

}



static void supermicro_old_pre_keepalive(unsigned long acpibase)

{

	/* Reload TCO Timer (done in iTCO_wdt_keepalive) + */

	/* Clear "Expire Flag" (Bit 3 of TC01_STS register) */

	outb(0x08, TCO1_STS);

}



/*

 *	Vendor Support: 2

 *	Board: Super Micro Computer Inc. P4SBx, P4DPx

 *	iTCO chipset: ICH4

 *

 *	Code contributed by: R. Seretny <lkpatches@paypc.com>

 *	Documentation obtained by R. Seretny from SuperMicro Technical Support

 *

 *	To enable Watchdog function:

 *	 1. BIOS

 *	  For P4SBx:

 *	  BIOS setup -> Advanced -> Integrated Peripherals -> Watch Dog Feature

 *	  For P4DPx:

 *	  BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog

 *	 This setting enables or disables Watchdog function. When enabled, the

 *	 default watchdog timer is set to be 5 minutes (about 4’35”). It is

 *	 enough to load and run the OS. The application (service or driver) has

 *	 to take over the control once OS is running up and before watchdog

 *	 expires.

 *

 *	 2. JUMPER

 *	  For P4SBx: JP39

 *	  For P4DPx: JP37

 *	  This jumper is used for safety.  Closed is enabled. This jumper

 *	  prevents user enables watchdog in BIOS by accident.

 *

 *	 To enable Watch Dog function, both BIOS and JUMPER must be enabled.

 *

 *	The documentation lists motherboards P4SBx and P4DPx series as of

 *	20-March-2002. However, this code works flawlessly with much newer

 *	motherboards, such as my X6DHR-8G2 (SuperServer 6014H-82).

 *

 *	The original iTCO driver as written does not actually reset the

 *	watchdog timer on these machines, as a result they reboot after five

 *	minutes.

 *

 *	NOTE: You may leave the Watchdog function disabled in the SuperMicro

 *	BIOS to avoid a "boot-race"... This driver will enable watchdog

 *	functionality even if it's disabled in the BIOS once the /dev/watchdog

 *	file is opened.

 */



/* I/O Port's */

#define SM_REGINDEX	0x2e		/* SuperMicro ICH4+ Register Index */

#define SM_DATAIO	0x2f		/* SuperMicro ICH4+ Register Data I/O */



/* Control Register's */

#define SM_CTLPAGESW	0x07		/* SuperMicro ICH4+ Control Page Switch */

#define SM_CTLPAGE		0x08	/* SuperMicro ICH4+ Control Page Num */



#define SM_WATCHENABLE	0x30		/* Watchdog enable: Bit 0: 0=off, 1=on */



#define SM_WATCHPAGE	0x87		/* Watchdog unlock control page */



#define SM_ENDWATCH	0xAA		/* Watchdog lock control page */



#define SM_COUNTMODE	0xf5		/* Watchdog count mode select */

					/* (Bit 3: 0 = seconds, 1 = minutes */



#define SM_WATCHTIMER	0xf6		/* 8-bits, Watchdog timer counter (RW) */



#define SM_RESETCONTROL	0xf7		/* Watchdog reset control */

					/* Bit 6: timer is reset by kbd interrupt */

					/* Bit 7: timer is reset by mouse interrupt */



static void supermicro_new_unlock_watchdog(void)

{

	outb(SM_WATCHPAGE, SM_REGINDEX);	/* Write 0x87 to port 0x2e twice */

	outb(SM_WATCHPAGE, SM_REGINDEX);



	outb(SM_CTLPAGESW, SM_REGINDEX);	/* Switch to watchdog control page */

	outb(SM_CTLPAGE, SM_DATAIO);

}



static void supermicro_new_lock_watchdog(void)

{

	outb(SM_ENDWATCH, SM_REGINDEX);

}



static void supermicro_new_pre_start(unsigned int heartbeat)

{

	unsigned int val;



	supermicro_new_unlock_watchdog();



	/* Watchdog timer setting needs to be in seconds*/

	outb(SM_COUNTMODE, SM_REGINDEX);

	val = inb(SM_DATAIO);

	val &= 0xF7;

	outb(val, SM_DATAIO);



	/* Write heartbeat interval to WDOG */

	outb (SM_WATCHTIMER, SM_REGINDEX);

	outb((heartbeat & 255), SM_DATAIO);



	/* Make sure keyboard/mouse interrupts don't interfere */

	outb(SM_RESETCONTROL, SM_REGINDEX);

	val = inb(SM_DATAIO);

	val &= 0x3f;

	outb(val, SM_DATAIO);



	/* enable watchdog by setting bit 0 of Watchdog Enable to 1 */

	outb(SM_WATCHENABLE, SM_REGINDEX);

	val = inb(SM_DATAIO);

	val |= 0x01;

	outb(val, SM_DATAIO);



	supermicro_new_lock_watchdog();

}



static void supermicro_new_pre_stop(void)

{

	unsigned int val;



	supermicro_new_unlock_watchdog();



	/* disable watchdog by setting bit 0 of Watchdog Enable to 0 */

	outb(SM_WATCHENABLE, SM_REGINDEX);

	val = inb(SM_DATAIO);

	val &= 0xFE;

	outb(val, SM_DATAIO);



	supermicro_new_lock_watchdog();

}



static void supermicro_new_pre_set_heartbeat(unsigned int heartbeat)

{

	supermicro_new_unlock_watchdog();



	/* reset watchdog timeout to heartveat value */

	outb(SM_WATCHTIMER, SM_REGINDEX);

	outb((heartbeat & 255), SM_DATAIO);



	supermicro_new_lock_watchdog();

}



/*

 *	Generic Support Functions

 */



void iTCO_vendor_pre_start(unsigned long acpibase,

			   unsigned int heartbeat)

{

	if (vendorsupport == SUPERMICRO_OLD_BOARD)

		supermicro_old_pre_start(acpibase);

	else if (vendorsupport == SUPERMICRO_NEW_BOARD)

		supermicro_new_pre_start(heartbeat);

}

EXPORT_SYMBOL(iTCO_vendor_pre_start);



void iTCO_vendor_pre_stop(unsigned long acpibase)

{

	if (vendorsupport == SUPERMICRO_OLD_BOARD)

		supermicro_old_pre_stop(acpibase);

	else if (vendorsupport == SUPERMICRO_NEW_BOARD)

		supermicro_new_pre_stop();

}

EXPORT_SYMBOL(iTCO_vendor_pre_stop);



void iTCO_vendor_pre_keepalive(unsigned long acpibase, unsigned int heartbeat)

{

	if (vendorsupport == SUPERMICRO_OLD_BOARD)

		supermicro_old_pre_keepalive(acpibase);

	else if (vendorsupport == SUPERMICRO_NEW_BOARD)

		supermicro_new_pre_set_heartbeat(heartbeat);

}

EXPORT_SYMBOL(iTCO_vendor_pre_keepalive);



void iTCO_vendor_pre_set_heartbeat(unsigned int heartbeat)

{

	if (vendorsupport == SUPERMICRO_NEW_BOARD)

		supermicro_new_pre_set_heartbeat(heartbeat);

}

EXPORT_SYMBOL(iTCO_vendor_pre_set_heartbeat);



int iTCO_vendor_check_noreboot_on(void)

{

	switch(vendorsupport) {

	case SUPERMICRO_OLD_BOARD:

		return 0;

	default:

		return 1;

	}

}

EXPORT_SYMBOL(iTCO_vendor_check_noreboot_on);



static int __init iTCO_vendor_init_module(void)

{

	printk (KERN_INFO PFX "vendor-support=%d\n", vendorsupport);

	return 0;

}



static void __exit iTCO_vendor_exit_module(void)

{

	printk (KERN_INFO PFX "Module Unloaded\n");

}



module_init(iTCO_vendor_init_module);

module_exit(iTCO_vendor_exit_module);



MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>, R. Seretny <lkpatches@paypc.com>");

MODULE_DESCRIPTION("Intel TCO Vendor Specific WatchDog Timer Driver Support");

MODULE_VERSION(DRV_VERSION);

MODULE_LICENSE("GPL");

drivers/char/watchdog/iTCO_wdt.c

+26 −3
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 


/* Module and version information */

#define DRV_NAME        "iTCO_wdt"

#define DRV_VERSION     "1.00"

#define DRV_RELDATE     "08-Oct-2006"

#define DRV_VERSION     "1.01"

#define DRV_RELDATE     "11-Nov-2006"

#define PFX		DRV_NAME ": "



/* Includes */
@@ -189,6 +189,21 @@ static int nowayout = WATCHDOG_NOWAYOUT; 
module_param(nowayout, int, 0);

MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");



/* iTCO Vendor Specific Support hooks */

#ifdef CONFIG_ITCO_VENDOR_SUPPORT

extern void iTCO_vendor_pre_start(unsigned long, unsigned int);

extern void iTCO_vendor_pre_stop(unsigned long);

extern void iTCO_vendor_pre_keepalive(unsigned long, unsigned int);

extern void iTCO_vendor_pre_set_heartbeat(unsigned int);

extern int iTCO_vendor_check_noreboot_on(void);

#else

#define iTCO_vendor_pre_start(acpibase, heartbeat)	{}

#define iTCO_vendor_pre_stop(acpibase)			{}

#define iTCO_vendor_pre_keepalive(acpibase,heartbeat)	{}

#define iTCO_vendor_pre_set_heartbeat(heartbeat)	{}

#define iTCO_vendor_check_noreboot_on()			1	/* 1=check noreboot; 0=don't check */

#endif



/*

 * Some TCO specific functions

 */
@@ -249,6 +264,8 @@ static int iTCO_wdt_start(void) 


	spin_lock(&iTCO_wdt_private.io_lock);



	iTCO_vendor_pre_start(iTCO_wdt_private.ACPIBASE, heartbeat);



	/* disable chipset's NO_REBOOT bit */

	if (iTCO_wdt_unset_NO_REBOOT_bit()) {

		printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
@@ -273,6 +290,8 @@ static int iTCO_wdt_stop(void) 


	spin_lock(&iTCO_wdt_private.io_lock);



	iTCO_vendor_pre_stop(iTCO_wdt_private.ACPIBASE);



	/* Bit 11: TCO Timer Halt -> 1 = The TCO timer is disabled */

	val = inw(TCO1_CNT);

	val |= 0x0800;
@@ -293,6 +312,8 @@ static int iTCO_wdt_keepalive(void) 
{

	spin_lock(&iTCO_wdt_private.io_lock);



	iTCO_vendor_pre_keepalive(iTCO_wdt_private.ACPIBASE, heartbeat);



	/* Reload the timer by writing to the TCO Timer Counter register */

	if (iTCO_wdt_private.iTCO_version == 2) {

		outw(0x01, TCO_RLD);
@@ -319,6 +340,8 @@ static int iTCO_wdt_set_heartbeat(int t) 
	    ((iTCO_wdt_private.iTCO_version == 1) && (tmrval > 0x03f)))

		return -EINVAL;



	iTCO_vendor_pre_set_heartbeat(tmrval);



	/* Write new heartbeat to watchdog */

	if (iTCO_wdt_private.iTCO_version == 2) {

		spin_lock(&iTCO_wdt_private.io_lock);
@@ -569,7 +592,7 @@ static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent, 
	}



	/* Check chipset's NO_REBOOT bit */

	if (iTCO_wdt_unset_NO_REBOOT_bit()) {

	if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) {

		printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");

		ret = -ENODEV;	/* Cannot reset NO_REBOOT bit */

		goto out;

drivers/char/watchdog/pc87413_wdt.c

0 → 100644
+635 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE