Date: Sat, 20 Aug 2011 17:11:51 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225045 - user/adrian/if_ath_tx/sys/dev/ath Message-ID: <201108201711.p7KHBpdB061208@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Aug 20 17:11:51 2011 New Revision: 225045 URL: http://svn.freebsd.org/changeset/base/225045 Log: * Add some debugging to announce functions which call ath_tx_flushtxq(). * Disable ath_tx_flushtxq() for ath_reset(), on a hunch. It likely isn't needed. * Add some more comments about what's going on and what the implications seem to be flushing the TXQ there. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Sat Aug 20 17:05:11 2011 (r225044) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Sat Aug 20 17:11:51 2011 (r225045) @@ -1137,6 +1137,8 @@ ath_vap_delete(struct ieee80211vap *vap) struct ath_hal *ah = sc->sc_ah; struct ath_vap *avp = ATH_VAP(vap); + DPRINTF(sc, ATH_DEBUG_RESET, "%s: called\n", __func__); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { /* * Quiesce the hardware while we remove the vap. In @@ -1145,6 +1147,7 @@ ath_vap_delete(struct ieee80211vap *vap) */ ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* stop hw xmit side */ + /* XXX Do all frames from all vaps/nodes need draining here? */ ath_sc_flushtxq(sc); /* drain sw xmit side */ ath_stoprecv(sc); /* stop recv side */ } @@ -1169,6 +1172,7 @@ ath_vap_delete(struct ieee80211vap *vap) */ ath_draintxq(sc); + /* XXX Do all frames from all vaps/nodes need draining here? */ ath_sc_flushtxq(sc); ATH_LOCK(sc); @@ -1745,6 +1749,10 @@ ath_stop_locked(struct ifnet *ifp) ath_hal_intrset(ah, 0); } ath_draintxq(sc); + /* + * XXX Draining these packets may create a hole in the + * XXX BAW. + */ ath_sc_flushtxq(sc); /* drain sw xmit side */ if (!sc->sc_invalid) { ath_stoprecv(sc); @@ -1780,9 +1788,23 @@ ath_reset(struct ifnet *ifp) struct ath_hal *ah = sc->sc_ah; HAL_STATUS status; + DPRINTF(sc, ATH_DEBUG_RESET, "%s: called\n", __func__); + ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* stop xmit side */ + /* + * XXX as long as ath_reset() isn't called during a state + * transition (eg channel change, mode change, etc) + * then there's no need to flush the software TXQ. + * Doing this here messes with the BAW tracking, as + * there may be aggregate packets in the software TXQ + * which haven't been queued to the hardware, and thus + * the BAW hasn't been set. Freeing those packets will + * create a "hole" in the BAW. + */ +#if 0 ath_sc_flushtxq(sc); /* drain sw xmit side */ +#endif ath_stoprecv(sc); /* stop recv side */ ath_settkipmic(sc); /* configure TKIP MIC handling */ /* NB: indicate channel change so we do a full reset */ @@ -4669,6 +4691,17 @@ ath_chan_set(struct ath_softc *sc, struc */ ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* clear pending tx frames */ + /* + * XXX This may create holes in the BAW, since some + * XXX aggregate packets may have not yet been scheduled + * XXX to the hardware, and thus ath_tx_addto_baw() has + * XXX never been called. + * + * But we can't _not_ call this here, because the current + * TX code doesn't handle the potential rate/flags change + * (eg a 40->20mhz change, or HT->non-HT change, or 11a<->g + * change, etc.) + */ ath_sc_flushtxq(sc); /* drain sw xmit side */ ath_stoprecv(sc); /* turn off frame recv */ if (!ath_hal_reset(ah, sc->sc_opmode, chan, AH_TRUE, &status)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108201711.p7KHBpdB061208>