Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 May 2012 23:55:08 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r235947 - in stable/8: share/man/man4 sys/amd64/conf sys/boot/forth sys/conf sys/dev/wbwd sys/i386/conf sys/modules sys/modules/wbwd
Message-ID:  <201205242355.q4ONt8JJ067857@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Thu May 24 23:55:08 2012
New Revision: 235947
URL: http://svn.freebsd.org/changeset/base/235947

Log:
  MFC r232614:
  
    Provide wbwd(4), a driver for the watchdog timer found on various
    Winbond Super I/O chips.

Added:
  stable/8/share/man/man4/wbwd.4
     - copied unchanged from r232614, head/share/man/man4/wbwd.4
  stable/8/sys/dev/wbwd/
     - copied from r232614, head/sys/dev/wbwd/
  stable/8/sys/modules/wbwd/
     - copied from r232614, head/sys/modules/wbwd/
Modified:
  stable/8/sys/amd64/conf/GENERIC.hints
  stable/8/sys/amd64/conf/NOTES
  stable/8/sys/boot/forth/loader.conf
  stable/8/sys/conf/files.amd64
  stable/8/sys/conf/files.i386
  stable/8/sys/i386/conf/GENERIC.hints
  stable/8/sys/i386/conf/NOTES
  stable/8/sys/modules/Makefile
Directory Properties:
  stable/8/share/man/man4/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/boot/   (props changed)

Copied: stable/8/share/man/man4/wbwd.4 (from r232614, head/share/man/man4/wbwd.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/share/man/man4/wbwd.4	Thu May 24 23:55:08 2012	(r235947, copy of r232614, head/share/man/man4/wbwd.4)
@@ -0,0 +1,117 @@
+.\"-
+.\" Copyright (c) 2012 Bjoern A. Zeeb <bz@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd March 6, 2012
+.Dt wbwd 4
+.Os
+.Sh NAME
+.Nm wbwd
+.Nd device driver for watchdog timer found on Winbond Super I/O chips
+.Sh SYNOPSIS
+To compile this driver into the kernel, place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device wbwd"
+.Ed
+.Pp
+Alternatively, to load the driver as a module at boot time, place the following
+line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+wbwd_load="YES"
+.Ed
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.wbwd.0.at="isa"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides
+.Xr watchdog 4
+support for the watchdog interrupt timer present on at least the following
+Winbond Super I/O chips:
+.Pp
+.Bl -bullet -compact
+.It
+83627HF/F/HG/G Rev. G
+.It
+83627HF/F/HG/G Rev. J
+.It
+83627HF/F/HG/G Rev. UD-A
+.It
+83627DHG IC ver. 5
+.El
+.Sh SYSCTL VARIABLES
+The
+.Nm
+driver provides the following options as
+.Xr sysctl 8
+variables.
+.Bl -tag -width "xxxxxx"  
+.It Va dev.wbwd.0.timeout_override
+This variable allows to program the timer to a value independent on the one
+provided by the
+.Xr watchdog 4
+framework while still relying on the regular updates from e.g.
+.Xr watchdogd 8 .
+This is particularly useful if your system provides multiple watchdogs and
+you want them to fire in a special sequence to trigger an NMI after a shorter
+period than the reset timeout for example.
+The value set must not be lower than the sleep time of
+.Xr watchdogd 8 .
+A value of 0 disables this feature and the timeout value provided by
+.Xr watchdog 4
+will be used.
+.It Va dev.wbwd.0.debug_verbose
+If set this sysctl will tell the driver to log its current state before and
+after the timer reset on each invocation from
+.Xr watchdog 9
+to the kernel message buffer for debugging.
+.It Va dev.wbwd.0.debug
+This read-only value gives the state of some registers on last update.
+.El
+.Pp
+The
+.Nm
+driver also provides further sysctl options that are hidden by default.
+See the source code for more information.
+.Sh SEE ALSO
+.Xr watchdog 4 ,
+.Xr device.hints 5 ,
+.Xr watchdog 8 ,
+.Xr watchdogd 8 ,
+.Xr watchdog 9
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+This manual page was written by
+.An Bjoern A. Zeeb Aq bz@FreeBSD.org .

Modified: stable/8/sys/amd64/conf/GENERIC.hints
==============================================================================
--- stable/8/sys/amd64/conf/GENERIC.hints	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/amd64/conf/GENERIC.hints	Thu May 24 23:55:08 2012	(r235947)
@@ -27,3 +27,4 @@ hint.ppc.0.irq="7"
 hint.atrtc.0.at="isa"
 hint.atrtc.0.port="0x70"
 hint.atrtc.0.irq="8"
+hint.wbwd.0.at="isa"

Modified: stable/8/sys/amd64/conf/NOTES
==============================================================================
--- stable/8/sys/amd64/conf/NOTES	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/amd64/conf/NOTES	Thu May 24 23:55:08 2012	(r235947)
@@ -465,10 +465,12 @@ device		tpm
 #
 # ichwd: Intel ICH watchdog timer
 # amdsbwd: AMD SB7xx watchdog timer
+# wbwd: Winbond watchdog timer
 #
 device		ichwd
 device		amdsbwd
 device		viawd
+device		wbwd
 
 #
 # Temperature sensors:

Modified: stable/8/sys/boot/forth/loader.conf
==============================================================================
--- stable/8/sys/boot/forth/loader.conf	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/boot/forth/loader.conf	Thu May 24 23:55:08 2012	(r235947)
@@ -477,6 +477,7 @@ vpd_load="NO"			# Vital Product Data ker
 vpo_load="NO"			# Parallel to SCSI interface driver
 amdtemp_load="NO"		# AMD K8/K10/K11 temperature monitor
 tpm_load="NO"			# Trusted Platform Module
+wbwd_load="NO"			# Winbond watchdog
 
 ##############################################################
 ###  ACPI settings  ##########################################

Modified: stable/8/sys/conf/files.amd64
==============================================================================
--- stable/8/sys/conf/files.amd64	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/conf/files.amd64	Thu May 24 23:55:08 2012	(r235947)
@@ -239,6 +239,7 @@ dev/tpm/tpm_acpi.c		optional	tpm acpi
 dev/tpm/tpm_isa.c		optional	tpm isa
 dev/uart/uart_cpu_amd64.c	optional	uart
 dev/viawd/viawd.c		optional	viawd
+dev/wbwd/wbwd.c			optional	wbwd
 dev/wpi/if_wpi.c		optional	wpi
 dev/isci/isci.c							optional isci
 dev/isci/isci_controller.c					optional isci

Modified: stable/8/sys/conf/files.i386
==============================================================================
--- stable/8/sys/conf/files.i386	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/conf/files.i386	Thu May 24 23:55:08 2012	(r235947)
@@ -246,6 +246,7 @@ dev/uart/uart_cpu_i386.c	optional uart
 dev/viawd/viawd.c		optional viawd
 dev/acpica/acpi_if.m		standard
 dev/acpi_support/acpi_wmi_if.m	standard
+dev/wbwd/wbwd.c			optional wbwd
 dev/wpi/if_wpi.c		optional wpi
 dev/isci/isci.c							optional isci
 dev/isci/isci_controller.c					optional isci

Modified: stable/8/sys/i386/conf/GENERIC.hints
==============================================================================
--- stable/8/sys/i386/conf/GENERIC.hints	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/i386/conf/GENERIC.hints	Thu May 24 23:55:08 2012	(r235947)
@@ -35,3 +35,4 @@ hint.ppc.0.irq="7"
 hint.atrtc.0.at="isa"
 hint.atrtc.0.port="0x70"
 hint.atrtc.0.irq="8"
+hint.wbwd.0.at="isa"

Modified: stable/8/sys/i386/conf/NOTES
==============================================================================
--- stable/8/sys/i386/conf/NOTES	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/i386/conf/NOTES	Thu May 24 23:55:08 2012	(r235947)
@@ -850,10 +850,12 @@ hint.pcf.0.irq="5"
 #
 # ichwd: Intel ICH watchdog timer
 # amdsbwd: AMD SB7xx watchdog timer
+# wbwd: Winbond watchdog timer
 #
 device		ichwd
 device		amdsbwd
 device		viawd
+device		wbwd
 
 #
 # Temperature sensors:

Modified: stable/8/sys/modules/Makefile
==============================================================================
--- stable/8/sys/modules/Makefile	Thu May 24 23:46:17 2012	(r235946)
+++ stable/8/sys/modules/Makefile	Thu May 24 23:55:08 2012	(r235947)
@@ -316,6 +316,7 @@ SUBDIR=	${_3dfx} \
 	vte \
 	vx \
 	wb \
+	${_wbwd} \
 	${_wi} \
 	wlan \
 	wlan_acl \
@@ -460,6 +461,7 @@ _stg=		stg
 _streams=	streams
 _svr4=		svr4
 _tmpfs=		tmpfs
+_wbwd=		wbwd
 _wi=		wi
 _xe=		xe
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -613,6 +615,7 @@ _twa=		twa
 _vesa=		vesa
 _viawd=		viawd
 _x86bios=	x86bios
+_wbwd=		wbwd
 _wi=		wi
 _wpi=		wpi
 _wpifw=		wpifw



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205242355.q4ONt8JJ067857>