Index: sys/mips/atheros/ar71xx_wdog.c
===================================================================
--- sys/mips/atheros/ar71xx_wdog.c	(revision 7)
+++ sys/mips/atheros/ar71xx_wdog.c	(working copy)
@@ -38,12 +38,15 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/sysctl.h>
 
 #include <mips/atheros/ar71xxreg.h>
 
 struct ar71xx_wdog_softc {
 	device_t dev;
 	int armed;
+	int reboot_from_watchdog;
+	int debug;
 };
 
 static void
@@ -53,9 +56,13 @@
 	uint64_t timer_val;
 
 	cmd &= WD_INTERVAL;
+	if (sc->debug)
+		device_printf(sc->dev, "ar71xx_wdog_watchdog_fn: cmd: %x\n", cmd);
 	if (cmd > 0) {
 		timer_val = (uint64_t)(1ULL << cmd) * ar71xx_ahb_freq() /
 		    1000000000;
+		if (sc->debug)
+			device_printf(sc->dev, "ar71xx_wdog_watchdog_fn: programming timer: %llx\n", (unsigned long long) timer_val);
 		/*
 		 * Load timer with large enough value to prevent spurious
 		 * reset
@@ -69,6 +76,8 @@
 		sc->armed = 1;
 		*error = 0;
 	} else {
+		if (sc->debug)
+			device_printf(sc->dev, "ar71xx_wdog_watchdog_fn: disarming\n");
 		if (sc->armed) {
 			ATH_WRITE_REG(AR71XX_RST_WDOG_CONTROL, 
 			    RST_WDOG_ACTION_NOACTION);
@@ -85,19 +94,47 @@
 	return (0);
 }
 
+static void
+ar71xx_wdog_sysctl(device_t dev)
+{
+	struct ar71xx_wdog_softc *sc = device_get_softc(dev);
+
+        struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->dev);
+        struct sysctl_oid *tree = device_get_sysctl_tree(sc->dev);
+
+        SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+                "debug", CTLFLAG_RW, &sc->debug, 0,
+                "enable watchdog debugging");
+        SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+                "armed", CTLFLAG_RD, &sc->armed, 0,
+                "whether the watchdog is armed");
+        SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+                "reboot_from_watchdog", CTLFLAG_RD, &sc->reboot_from_watchdog, 0,
+                "whether the system rebooted from the watchdog");
+}
+
+
 static int
 ar71xx_wdog_attach(device_t dev)
 {
 	struct ar71xx_wdog_softc *sc = device_get_softc(dev);
 	
-	if (ATH_READ_REG(AR71XX_RST_WDOG_CONTROL) & RST_WDOG_LAST)
+	/* Initialise */
+	sc->reboot_from_watchdog = 0;
+	sc->armed = 0;
+	sc->debug = 0;
+
+	if (ATH_READ_REG(AR71XX_RST_WDOG_CONTROL) & RST_WDOG_LAST) {
 		device_printf (dev, 
 		    "Previous reset was due to watchdog timeout\n");
+		sc->reboot_from_watchdog = 1;
+	}
 
 	ATH_WRITE_REG(AR71XX_RST_WDOG_CONTROL, RST_WDOG_ACTION_NOACTION);
 
 	sc->dev = dev;
 	EVENTHANDLER_REGISTER(watchdog_list, ar71xx_wdog_watchdog_fn, sc, 0);
+	ar71xx_wdog_sysctl(dev);
 
 	return (0);
 }