 @@ -1,14 +1,14 @@
-/*	$NetBSD: swwdog.c,v 1.10 2010/07/22 14:10:15 pgoyette Exp $	*/
+/*	$NetBSD: swwdog.c,v 1.11 2010/08/06 16:02:56 pooka Exp $	*/
 /*
  * Copyright (c) 2004, 2005 Steven M. Bellovin
  * 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.
 @@ -23,27 +23,27 @@
  * ``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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.10 2010/07/22 14:10:15 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.11 2010/08/06 16:02:56 pooka Exp $");
 /*
+ *
  * Software watchdog timer
+ *
  */
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 @@ -72,26 +72,29 @@ static int swwdog_tickle(struct sysmon_w
 static int swwdog_arm(struct swwdog_softc *);
 static int swwdog_disarm(struct swwdog_softc *);
 static void swwdog_panic(void *);
 bool swwdog_reboot = false;		/* set for panic instead of reboot */
 #define	SWDOG_DEFAULT	60		/* 60-second default period */
 CFATTACH_DECL_NEW(swwdog, sizeof(struct swwdog_softc),
 	swwdog_match, swwdog_attach, swwdog_detach, NULL);
 static void swwdog_sysctl_setup(void);
 static struct sysctllog *swwdog_sysctllog;
 void
 swwdogattach(int n __unused)
+{
 	int err;
 	static struct cfdata cf;
 	err = config_cfattach_attach(swwdog_cd.cd_name, &swwdog_ca);
 	if (err) {
 		aprint_error("%s: couldn't register cfattach: %d\n",
 		    swwdog_cd.cd_name, err);
 		config_cfdriver_detach(&swwdog_cd);
 		return;
+	}
 @@ -124,35 +127,38 @@ swwdog_attach(device_t parent, device_t
 	sc->sc_smw.smw_tickle = swwdog_tickle;
 	sc->sc_smw.smw_period = SWDOG_DEFAULT;
 	callout_init(&sc->sc_c, 0);
 	callout_setfunc(&sc->sc_c, swwdog_panic, sc);
 	if (sysmon_wdog_register(&sc->sc_smw) == 0)
 		aprint_normal_dev(self, "software watchdog initialized\n");
 	else
 		aprint_error_dev(self, "unable to register software "
 		    "watchdog with sysmon\n");
 	if (!pmf_device_register(self, swwdog_suspend, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	swwdog_sysctl_setup();
+}
 static int
 swwdog_detach(device_t self, int flags)
+{
 	struct swwdog_softc *sc = device_private(self);
 	swwdog_disarm(sc);
 	callout_destroy(&sc->sc_c);
 	sysctl_teardown(&swwdog_sysctllog);
 	return 1;
+}
 static bool
 swwdog_suspend(device_t dev, const pmf_qual_t *qual)
+{
 	struct swwdog_softc *sc = device_private(dev);
 	/* Don't allow suspend if watchdog is armed */
 	if ((sc->sc_smw.smw_mode & WDOG_MODE_MASK) != WDOG_MODE_DISARMED)
 		return false;
 	return true;
 @@ -197,48 +203,42 @@ static int
 swwdog_disarm(struct swwdog_softc *sc)
+{
 	callout_stop(&sc->sc_c);
 	return 0;
+}
 static void
 swwdog_panic(void *vsc)
+{
 	struct swwdog_softc *sc = vsc;
 	bool do_panic;
-	do_panic = swwdog_reboot;
+	do_panic = !swwdog_reboot;
-	swwdog_reboot = 1;
+	swwdog_reboot = false;
 	callout_schedule(&sc->sc_c, 60 * hz);	/* deliberate double-panic */
 	printf("%s: %d second timer expired\n", device_xname(sc->sc_dev),
 	    sc->sc_smw.smw_period);
 	if (do_panic)
 		panic("watchdog timer expired");
 	else
 		cpu_reboot(0, NULL);
+}
-SYSCTL_SETUP(sysctl_swwdog, "swwdog subtree setup")
+static void
 swwdog_sysctl_setup(void)
+{
 	int err;
 	const struct sysctlnode *me;
-	err = sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_PERMANENT,
+	KASSERT(swwdog_sysctllog == NULL);
 	    CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_HW, CTL_EOL);
-	if (err == 0)
+	sysctl_createv(&swwdog_sysctllog, 0, NULL, &me, CTLFLAG_READWRITE,
-		err = sysctl_createv(NULL, 0, NULL, &me, CTLFLAG_READWRITE,
+	    CTLTYPE_NODE, "swwdog", NULL,
-		    CTLTYPE_NODE, "swwdog", NULL,
+	    NULL, 0, NULL, 0,
-		    NULL, 0, NULL, 0,
+	    CTL_HW, CTL_CREATE, CTL_EOL);
-		    CTL_HW, CTL_CREATE, CTL_EOL);
+	sysctl_createv(&swwdog_sysctllog, 0, NULL, NULL, CTLFLAG_READWRITE,
 	    CTLTYPE_BOOL, "reboot", "reboot if timer expires",
-	if (err == 0)
+	    NULL, 0, &swwdog_reboot, sizeof(bool),
-		err = sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_READWRITE,
+	    CTL_HW, me->sysctl_num, CTL_CREATE, CTL_EOL);
 		    CTLTYPE_BOOL, "reboot", "reboot if timer expires",
 		    NULL, 0, &swwdog_reboot, sizeof(bool),
 		    CTL_HW, me->sysctl_num, CTL_CREATE, CTL_EOL);
+}