d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert a previous commit - this is causing hardware errors.

Browse Source 
I'm not sure why this is failing.  The holding descriptor should be being
re-read when starting DMA of the next frame.  Obviously something here
isn't totally correct.

I'll review the TX queue handling and see if I can figure out why this
is failing.  I'll then re-revert this patch out and use the holding
descriptor again.
This commit is contained in:
Adrian Chadd 2013-05-08 07:30:33 +00:00
parent 2c47932c88
commit d3731e4b21
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/ath/if_ath.c
View File

@ -4000,20 +4000,19 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq, int dosched)
break;
}
ATH_TXQ_REMOVE(txq, bf, bf_list);
/*
* Always mark the last buffer in this list as busy.
*
* The hardware may re-read the holding descriptor
* even if we hit the end of the list and try writing
* a new TxDP.
*
* If there's no holding descriptor then this is the
* last buffer in the list of buffers after a fresh
* reset; it'll soon become the holding buffer.
*/
bf->bf_last->bf_flags |= ATH_BUF_BUSY;
if (txq->axq_depth > 0) {
/*
* More frames follow. Mark the buffer busy
* so it's not re-used while the hardware may
* still re-read the link field in the descriptor.
*
* Use the last buffer in an aggregate as that
* is where the hardware may be - intermediate
* descriptors won't be "busy".
*/
bf->bf_last->bf_flags |= ATH_BUF_BUSY;
} else
txq->axq_link = NULL;
if (bf->bf_state.bfs_aggr)
txq->axq_aggr_depth--;

6
sys/dev/ath/if_ath_misc.h
View File

@ -131,10 +131,16 @@ extern void ath_start_task(void *arg, int npending);
static inline void
ath_tx_kick(struct ath_softc *sc)
{
struct ieee80211com *ic = sc->sc_ifp->if_l2com;
IEEE80211_TX_UNLOCK_ASSERT(ic);
ATH_TX_UNLOCK_ASSERT(sc);
IEEE80211_TX_LOCK(ic);
ATH_TX_LOCK(sc);
ath_start(sc->sc_ifp);
ATH_TX_UNLOCK(sc);
IEEE80211_TX_UNLOCK(ic);
}
/*