watchdog: update/improve/consolidate watchdog driver parameters
Subsystems (2)
From: Randy Dunlap <[email protected]>
Move the limited watchdog driver help from kernel-parameters.txt to Documentation/watchdog/watchdog-parameters.txt and add info to it for all watchdog drivers except the ones that have driver-specific files already.
Correct minor comments and MODULE_PARM_DESC() text in 2 places.
--- Documentation/kernel-parameters.txt | 15 Documentation/watchdog/00-INDEX | 5 Documentation/watchdog/watchdog-parameters.txt | 390 +++++++++++++++ Documentation/watchdog/wdt.txt | 15 drivers/watchdog/eurotechwdt.c | 1 drivers/watchdog/wdt.c | 2 6 files changed, 411 insertions(+), 17 deletions(-)
Documentation/watchdog/00-INDEX +5 -0
@@ -1,10 +1,15 @@ 00-INDEX - this file. +hpwdt.txt + - information on the HP iLO2 NMI watchdog pcwd-watchdog.txt - documentation for Berkshire Products PC Watchdog ISA cards. src/ - directory holding watchdog related example programs. watchdog-api.txt - description of the Linux Watchdog driver API. +watchdog-parameters.txt + - information on driver parameters (for drivers other than + the ones that have driver-specific files here) wdt.txt - description of the Watchdog Timer Interfaces for Linux.
Documentation/kernel-parameters.txt +4 -11
@@ -287,9 +287,6 @@ and is between 256 and 4096 characters. advansys= [HW,SCSI] See header of drivers/scsi/advansys.c. - advwdt= [HW,WDT] Advantech WDT - Format: <iostart>,<iostop> - aedsp16= [HW,OSS] Audio Excel DSP 16 Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq> See also header of sound/oss/aedsp16.c.
@@ -754,9 +751,6 @@ and is between 256 and 4096 characters. This option is obsoleted by the "netdev=" option, which has equivalent usage. See its documentation for details. - eurwdt= [HW,WDT] Eurotech CPU-1220/1410 onboard watchdog. - Format: <io>[,<irq>] - failslab= fail_page_alloc= fail_make_request=[KNL]
@@ -2236,9 +2230,6 @@ and is between 256 and 4096 characters. sched_debug [KNL] Enables verbose scheduler debug messages. - sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver - Format: <io>[,<timeout>[,<isapnp>]] - scsi_debug_*= [SCSI] See drivers/scsi/scsi_debug.c.
@@ -2818,8 +2809,10 @@ and is between 256 and 4096 characters. wd7000= [HW,SCSI] See header of drivers/scsi/wd7000.c. - wdt= [WDT] Watchdog - See Documentation/watchdog/wdt.txt. + watchdog timers [HW,WDT] For information on watchdog timers, + see Documentation/watchdog/watchdog-parameters.txt + or other driver-specific files in the + Documentation/watchdog/ directory. x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of default x2apic cluster mode on platforms
drivers/watchdog/eurotechwdt.c +0 -1
@@ -68,7 +68,6 @@ static spinlock_t eurwdt_lock;/* * You must set these - there is no sane way to probe for this board. -* You can use eurwdt=x,y to set these now. */ static int io =0x3f0 ;
Documentation/watchdog/wdt.txt +11 -4
@@ -14,14 +14,22 @@ reboot will depend on the state of the m boards physically pull the machine down off their own onboard timers and will reboot from almost anything. -A second temperature monitoring interface is available on the WDT501P cards +A second temperature monitoring interface is available on the WDT501P cards. This provides /dev/temperature. This is the machine internal temperature in degrees Fahrenheit. Each read returns a single byte giving the temperature. The third interface logs kernel messages on additional alert events. -The wdt card cannot be safely probed for. Instead you need to pass -wdt=ioaddr,irq as a boot parameter - eg "wdt=0x240,11". +The ICS ISA-bus wdt card cannot be safely probed for. Instead you need to +pass IO address and IRQ boot parameters. E.g.: + wdt.io=0x240 wdt.irq=11 + +Other "wdt" driver parameters are: + heartbeat Watchdog heartbeat in seconds (default 60) + nowayout Watchdog cannot be stopped once started (kernel + build parameter) + tachometer WDT501-P Fan Tachometer support (0=disable, default=0) + type WDT501-P Card type (500 or 501, default=500) Features --------
@@ -40,4 +48,3 @@ Minor numbers are however allocated for Example Watchdog Driver: see Documentation/watchdog/src/watchdog-simple.c -
drivers/watchdog/wdt.c +1 -1
@@ -91,7 +91,7 @@ MODULE_PARM_DESC(tachometer,static int type =500 ;module_param (type, int,0 );MODULE_PARM_DESC (type, -"WDT501-P Card type (500 or 501 , default=500)" ); +"WDT501-P Card type (500 or 501, default=500)" );/* * Programming support
Documentation/watchdog/watchdog-parameters.txt new file +390 -0
390 lines not on this page · raw message
Hi Randi,
Quoted 10 lines
From: Randy Dunlap <[email protected]>
Move the limited watchdog driver help from kernel-parameters.txt to
Documentation/watchdog/watchdog-parameters.txtand add info to it for all watchdog drivers except the ones that have driver-specific files already.Correct minor comments and
MODULE_PARM_DESC()text in 2 places.Signed-off-by Randy Dunlap <[email protected]>
I will add this to the linux-2.6-watchdog-next tree.
Kind regards,
Wim.