Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7702e788 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: make per-WMM-AC queue sizes configurable via debugfs 



Prepare for using different queue size defaults for each AC.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 531bd079

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ struct ath_tx { 
	struct ath_txq txq[ATH9K_NUM_TX_QUEUES];

	struct ath_descdma txdma;

	struct ath_txq *txq_map[WME_NUM_AC];

	u32 txq_max_pending[WME_NUM_AC];

};



struct ath_rx_edma {

drivers/net/wireless/ath/ath9k/debug.c

+8 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,14 @@ int ath9k_init_debug(struct ath_hw *ah) 
			    &fops_interrupt);

	debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,

			    &fops_xmit);

	debugfs_create_u32("qlen_bk", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			   &sc->tx.txq_max_pending[WME_AC_BK]);

	debugfs_create_u32("qlen_be", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			   &sc->tx.txq_max_pending[WME_AC_BE]);

	debugfs_create_u32("qlen_vi", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			   &sc->tx.txq_max_pending[WME_AC_VI]);

	debugfs_create_u32("qlen_vo", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			   &sc->tx.txq_max_pending[WME_AC_VO]);

	debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,

			    &fops_stations);

	debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,

drivers/net/wireless/ath/ath9k/init.c

+1 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ static int ath9k_init_queues(struct ath_softc *sc) 
	for (i = 0; i < WME_NUM_AC; i++) {

		sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);

		sc->tx.txq_map[i]->mac80211_qnum = i;

		sc->tx.txq_max_pending[i] = ATH_MAX_QDEPTH;

	}

	return 0;

}

drivers/net/wireless/ath/ath9k/xmit.c

+4 −2
Original line number Diff line number Diff line
@@ -1988,7 +1988,8 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 


	ath_txq_lock(sc, txq);

	if (txq == sc->tx.txq_map[q] &&

	    ++txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {

	    ++txq->pending_frames > sc->tx.txq_max_pending[q] &&

	    !txq->stopped) {

		ieee80211_stop_queue(sc->hw, q);

		txq->stopped = true;

	}
@@ -2047,7 +2048,8 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, 
		if (WARN_ON(--txq->pending_frames < 0))

			txq->pending_frames = 0;



		if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {

		if (txq->stopped &&

		    txq->pending_frames < sc->tx.txq_max_pending[q]) {

			ieee80211_wake_queue(sc->hw, q);

			txq->stopped = false;

		}