From f451d23cfca58e9353ae7c58bf72abdf9e0a1b99 Mon Sep 17 00:00:00 2001 From: Attilio Rao Date: Mon, 25 Apr 2011 14:12:58 +0000 Subject: [PATCH] Add missing bit in r221015. Sponsored by: Sandvine Incorporated Reviewed by: des MFC after: 1 week X-MFC: r221015 --- sys/dev/ichwd/ichwd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c index 6bb9eee32989..b39747a27187 100644 --- a/sys/dev/ichwd/ichwd.c +++ b/sys/dev/ichwd/ichwd.c @@ -216,6 +216,15 @@ ichwd_smi_enable(struct ichwd_softc *sc) ichwd_write_smi_4(sc, SMI_EN, ichwd_read_smi_4(sc, SMI_EN) | SMI_TCO_EN); } +/* + * Check if the watchdog SMI triggering is enabled. + */ +static __inline int +ichwd_smi_is_enabled(struct ichwd_softc *sc) +{ + return ((ichwd_read_smi_4(sc, SMI_EN) & SMI_TCO_EN) != 0); +} + /* * Reset the watchdog status bits. */ @@ -534,6 +543,7 @@ ichwd_attach(device_t dev) sc->ev_tag = EVENTHANDLER_REGISTER(watchdog_list, ichwd_event, sc, 0); /* disable the SMI handler */ + sc->smi_enabled = ichwd_smi_is_enabled(sc); ichwd_smi_disable(sc); return (0); @@ -565,7 +575,8 @@ ichwd_detach(device_t dev) ichwd_tmr_disable(sc); /* enable the SMI handler */ - ichwd_smi_enable(sc); + if (sc->smi_enabled != 0) + ichwd_smi_enable(sc); /* deregister event handler */ if (sc->ev_tag != NULL)