Re: mec and resets

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

martin%duskware.de@localhost wrote:

> Is there some way to verify the watchdog is disabled? Or can we reconfigure
> it's timeout?

How about this?
---

Index: sgimips/dev/crime.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/crime.c,v
retrieving revision 1.29
diff -u -r1.29 crime.c
--- sgimips/dev/crime.c 26 May 2008 15:59:30 -0000      1.29
+++ sgimips/dev/crime.c 2 Aug 2008 17:02:50 -0000
@@ -175,7 +181,11 @@
        platform.bus_reset = crime_bus_reset;
        platform.watchdog_reset = crime_watchdog_reset;
        platform.watchdog_disable = crime_watchdog_disable;
+#ifdef CRIME_DISABLE_WATCHDOG
+       platform.watchdog_enable = crime_watchdog_disable;
+#else
        platform.watchdog_enable = crime_watchdog_reset;
+#endif
        platform.intr_establish = crime_intr_establish;
        platform.intr0 = crime_intr;
 }
@@ -279,14 +289,10 @@
 void
 crime_watchdog_reset(void)
 {
-#ifdef CRIME_WATCHDOG_DISABLE
-       bus_space_write_8(crm_iot, crm_ioh, CRIME_WATCHDOG, 0);
-#else
        /* enable watchdog timer, clear it */
        bus_space_write_8(crm_iot, crm_ioh,
                CRIME_CONTROL, CRIME_CONTROL_DOG_ENABLE);
        bus_space_write_8(crm_iot, crm_ioh, CRIME_WATCHDOG, 0);
-#endif
 }
 
 void

---
Izumi Tsutsui