Date: Mon, 10 Nov 2008 01:07:03 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 152720 for review Message-ID: <200811100107.mAA173L4017120@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152720 Change 152720 by sam@sam_ebb on 2008/11/10 01:06:43 nuke special handling of RXORN interrupt; the hal marks the FATAL bit when RXORN is hit and the chip requires a reset so our special handling was causing useless resets Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#121 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#36 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#121 (text+ko) ==== @@ -136,7 +136,6 @@ static void ath_watchdog(struct ifnet *); static int ath_ioctl(struct ifnet *, u_long, caddr_t); static void ath_fatal_proc(void *, int); -static void ath_rxorn_proc(void *, int); static void ath_bmiss_vap(struct ieee80211vap *); static void ath_bmiss_proc(void *, int); static int ath_keyset(struct ath_softc *, const struct ieee80211_key *, @@ -416,7 +415,6 @@ "%s taskq", ifp->if_xname); TASK_INIT(&sc->sc_rxtask, 0, ath_rx_proc, sc); - TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); @@ -1202,10 +1200,6 @@ sc->sc_stats.ast_hardware++; ath_hal_intrset(ah, 0); /* disable intr's until reset */ ath_fatal_proc(sc, 0); - } else if (status & HAL_INT_RXORN) { - sc->sc_stats.ast_rxorn++; - ath_hal_intrset(ah, 0); /* disable intr's until reset */ - taskqueue_enqueue(sc->sc_tq, &sc->sc_rxorntask); } else { if (status & HAL_INT_SWBA) { /* @@ -1252,6 +1246,10 @@ ath_hal_mibevent(ah, &sc->sc_halstats); ath_hal_intrset(ah, sc->sc_imask); } + if (status & HAL_INT_RXORN) { + /* NB: hal marks HAL_INT_FATAL when RXORN is fatal */ + sc->sc_stats.ast_rxorn++; + } } } @@ -1281,16 +1279,6 @@ } static void -ath_rxorn_proc(void *arg, int pending) -{ - struct ath_softc *sc = arg; - struct ifnet *ifp = sc->sc_ifp; - - if_printf(ifp, "rx FIFO overrun; resetting\n"); - ath_reset(ifp); -} - -static void ath_bmiss_vap(struct ieee80211vap *vap) { struct ifnet *ifp = vap->iv_ic->ic_ifp; ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#36 (text+ko) ==== @@ -302,7 +302,6 @@ struct mbuf *sc_rxpending; /* pending receive data */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ struct task sc_rxtask; /* rx int processing */ - struct task sc_rxorntask; /* rxorn int processing */ u_int8_t sc_defant; /* current default antenna */ u_int8_t sc_rxotherant; /* rx's on non-default antenna*/ u_int64_t sc_lastrx; /* tsf at last rx'd frame */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811100107.mAA173L4017120>