diff options
author | sam <sam@FreeBSD.org> | 2008-11-30 18:34:27 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2008-11-30 18:34:27 +0000 |
commit | 87ae668c80e48b515a3d63894f52fa9989da3505 (patch) | |
tree | 2cc738990608ea83d188f96c5a63961206a1bbab /sys/dev/ath | |
parent | e26a733b642467a31b60a334b5222325133c61a2 (diff) | |
download | FreeBSD-src-87ae668c80e48b515a3d63894f52fa9989da3505.zip FreeBSD-src-87ae668c80e48b515a3d63894f52fa9989da3505.tar.gz |
some of the 11n parts can hang under certain conditions without
necessary workarounds, add code to detect these hangs and distinguish
them from other events; note this code is only invoked for anomalous
conditions and (at the moment) is a noop because the hang detection
code is in a new hal that's coming shortly
Diffstat (limited to 'sys/dev/ath')
-rw-r--r-- | sys/dev/ath/if_ath.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 115034e..cd5e4c1 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -1290,14 +1290,33 @@ ath_bmiss_vap(struct ieee80211vap *vap) sc->sc_stats.ast_bmiss_phantom++; } +static int +ath_hal_gethangstate(struct ath_hal *ah, uint32_t mask, uint32_t *hangs) +{ + uint32_t rsize; + void *sp; + + if (!ath_hal_getdiagstate(ah, 32, &mask, sizeof(&mask), &sp, &rsize)) + return 0; + KASSERT(rsize == sizeof(uint32_t), ("resultsize %u", rsize)); + *hangs = *(uint32_t *)sp; + return 1; +} + static void ath_bmiss_proc(void *arg, int pending) { struct ath_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; + uint32_t hangs; DPRINTF(sc, ATH_DEBUG_ANY, "%s: pending %u\n", __func__, pending); - ieee80211_beacon_miss(ifp->if_l2com); + + if (ath_hal_gethangstate(sc->sc_ah, 0xff, &hangs) && hangs != 0) { + if_printf(ifp, "bb hang detected (0x%x), reseting\n", hangs); + ath_reset(ifp); + } else + ieee80211_beacon_miss(ifp->if_l2com); } /* @@ -6324,7 +6343,14 @@ ath_watchdog(struct ifnet *ifp) struct ath_softc *sc = ifp->if_softc; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && !sc->sc_invalid) { - if_printf(ifp, "device timeout\n"); + uint32_t hangs; + + if (ath_hal_gethangstate(sc->sc_ah, 0xffff, &hangs) && + hangs != 0) { + if_printf(ifp, "%s hang detected (0x%x)\n", + hangs & 0xff ? "bb" : "mac", hangs); + } else + if_printf(ifp, "device timeout\n"); ath_reset(ifp); ifp->if_oerrors++; sc->sc_stats.ast_watchdog++; |