ath9k: fix queue depth check for forming new aggregates
PATCH 1/2 ath9k: fix queue depth check for forming new aggregates
To improve aggregation length, there should not be more than two fully formed A-MPDU frames in the hardware queue. To ensure this, the code checks the tx queue length before forming new A-MPDUs. This can reduce the throughput (or maybe even starve out A-MPDU traffic) when too many non-aggregated frames are in the queue.
Fix this by keeping track of pending A-MPDU frames (even when they're sent out as single frames), but exclude rate control probing frames to improve performance.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/xmit.c | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
@@ -189,6 +189,7 @@ struct ath_txq {struct list_head axq_q;spinlock_t axq_lock;u32 axq_depth; +u32 axq_ampdu_depth;bool stopped;bool axq_tx_inprogress;struct list_head axq_acq;
drivers/net/wireless/ath/ath9k/xmit.c +18 -3
@@ -838,7 +838,7 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,ath_tx_txqaddbuf (sc, txq, &bf_q);TX_STAT_INC (txq->axq_qnum, a_aggr); - }while (txq->axq_depth <ATH_AGGR_MIN_QDEPTH && + }while (txq->axq_ampdu_depth <ATH_AGGR_MIN_QDEPTH && status !=ATH_AGGR_BAW_CLOSED ); }
@@ -999,6 +999,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)INIT_LIST_HEAD (&txq->axq_acq);spin_lock_init (&txq->axq_lock); txq->axq_depth =0 ; + txq->axq_ampdu_depth =0 ; txq->axq_tx_inprogress = false; sc->tx.txqsetup |=1 <<qnum;
@@ -1068,6 +1069,12 @@ int ath_cabq_update(struct ath_softc *sc)return 0 ; } +static bool bf_is_ampdu_not_probing (struct ath_buf *bf) +{ +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (bf->bf_mpdu); +return bf_isampdu (bf) && !(info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ); +} +/* * Drain a given TX queue (could be Beacon or Data) *
@@ -1126,7 +1133,8 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx) } txq->axq_depth--; - +if (bf_is_ampdu_not_probing (bf)) + txq->axq_ampdu_depth--;spin_unlock_bh (&txq->axq_lock);if (bf_isampdu (bf))
@@ -1316,6 +1324,8 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,ath9k_hw_txstart (ah, txq->axq_qnum); } txq->axq_depth++; +if (bf_is_ampdu_not_probing (bf)) + txq->axq_ampdu_depth++; } static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
@@ -1336,7 +1346,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,*/ if (!list_empty (&tid->buf_q) || tid->paused || !BAW_WITHIN (tid->seq_start, tid->baw_size, fi->seqno) || - txctl->txq->axq_depth >=ATH_AGGR_MIN_QDEPTH ) { + txctl->txq->axq_ampdu_depth >=ATH_AGGR_MIN_QDEPTH ) {/* * Add this frame to software queue for scheduling later * for aggregation.
@@ -2040,6 +2050,9 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) txq->axq_tx_inprogress = false;if (bf_held)list_del (&bf_held->list); + +if (bf_is_ampdu_not_probing (bf)) + txq->axq_ampdu_depth--;spin_unlock_bh (&txq->axq_lock);if (bf_held)
@@ -2168,6 +2181,8 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)INCR (txq->txq_tailidx,ATH_TXFIFO_DEPTH ); txq->axq_depth--; txq->axq_tx_inprogress = false; +if (bf_is_ampdu_not_probing (bf)) + txq->axq_ampdu_depth--;spin_unlock_bh (&txq->axq_lock); txok = !(txs.ts_status &ATH9K_TXERR_MASK );
Signature · 1 line
1.7.3.2
PATCH 2/2 ath9k_hw: remove baseband rfsilent support
When rfkill is enabled, ath9k_hw unnecessarily configured the baseband to turn off based on GPIO input, however that code was hardcoded to GPIO 0 instead of ah->rfkill_gpio.
Since ath9k uses software rfkill anyway, this code is completely unnecessary and should be removed in case anything else ever uses GPIO 0.
--- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 13 ------------- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 23 ----------------------- drivers/net/wireless/ath/ath9k/hw-ops.h | 5 ----- drivers/net/wireless/ath/ath9k/hw.c | 2 +- drivers/net/wireless/ath/ath9k/hw.h | 1 - 5 files changed, 1 insertions(+), 43 deletions(-)
drivers/net/wireless/ath/ath9k/ar5008_phy.c +0 -13
@@ -961,18 +961,6 @@ static void ar5008_hw_rfbus_done(struct ath_hw *ah)REG_WRITE (ah,AR_PHY_RFBUS_REQ ,0 ); } -static void ar5008_hw_enable_rfkill (struct ath_hw *ah) -{ -REG_SET_BIT (ah,AR_GPIO_INPUT_EN_VAL , -AR_GPIO_INPUT_EN_VAL_RFSILENT_BB ); - -REG_CLR_BIT (ah,AR_GPIO_INPUT_MUX2 , -AR_GPIO_INPUT_MUX2_RFSILENT ); - -ath9k_hw_cfg_gpio_input (ah, ah->rfkill_gpio); -REG_SET_BIT (ah,AR_PHY_TEST ,RFSILENT_BB ); -} -static void ar5008_restore_chainmask (struct ath_hw *ah) {int rx_chainmask = ah->rxchainmask;
@@ -1629,7 +1617,6 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah) priv_ops->set_delta_slope = ar5008_hw_set_delta_slope; priv_ops->rfbus_req = ar5008_hw_rfbus_req; priv_ops->rfbus_done = ar5008_hw_rfbus_done; - priv_ops->enable_rfkill = ar5008_hw_enable_rfkill; priv_ops->restore_chainmask = ar5008_restore_chainmask; priv_ops->set_diversity = ar5008_set_diversity; priv_ops->do_getnf = ar5008_hw_do_getnf;
drivers/net/wireless/ath/ath9k/ar9003_phy.c +0 -23
@@ -748,28 +748,6 @@ static void ar9003_hw_rfbus_done(struct ath_hw *ah)REG_WRITE (ah,AR_PHY_RFBUS_REQ ,0 ); } -/* -* Set the interrupt and GPIO values so the ISR can disable RF -* on a switch signal. Assumes GPIO port and interrupt polarity -* are set prior to call. -*/ -static void ar9003_hw_enable_rfkill (struct ath_hw *ah) -{ -/* Connect rfsilent_bb_l to baseband */ -REG_SET_BIT (ah,AR_GPIO_INPUT_EN_VAL , -AR_GPIO_INPUT_EN_VAL_RFSILENT_BB ); -/* Set input mux for rfsilent_bb_l to GPIO #0 */ -REG_CLR_BIT (ah,AR_GPIO_INPUT_MUX2 , -AR_GPIO_INPUT_MUX2_RFSILENT ); - -/* -* Configure the desired GPIO port for input and -* enable baseband rf silence. -*/ -ath9k_hw_cfg_gpio_input (ah, ah->rfkill_gpio); -REG_SET_BIT (ah,AR_PHY_TEST ,RFSILENT_BB ); -} -static void ar9003_hw_set_diversity (struct ath_hw *ah,bool value) {u32 v =REG_READ (ah,AR_PHY_CCK_DETECT );
@@ -1206,7 +1184,6 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah) priv_ops->set_delta_slope = ar9003_hw_set_delta_slope; priv_ops->rfbus_req = ar9003_hw_rfbus_req; priv_ops->rfbus_done = ar9003_hw_rfbus_done; - priv_ops->enable_rfkill = ar9003_hw_enable_rfkill; priv_ops->set_diversity = ar9003_hw_set_diversity; priv_ops->ani_control = ar9003_hw_ani_control; priv_ops->do_getnf = ar9003_hw_do_getnf;
drivers/net/wireless/ath/ath9k/hw-ops.h +0 -5
@@ -223,11 +223,6 @@ static inline void ath9k_hw_rfbus_done(struct ath_hw *ah)return ath9k_hw_private_ops (ah)->rfbus_done (ah); } -static inline void ath9k_enable_rfkill (struct ath_hw *ah) -{ -return ath9k_hw_private_ops (ah)->enable_rfkill (ah); -} -static inline void ath9k_hw_restore_chainmask (struct ath_hw *ah) {if (!ath9k_hw_private_ops (ah)->restore_chainmask)
drivers/net/wireless/ath/ath9k/hw.c +1 -1
@@ -1383,7 +1383,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_init_qos (ah);if (ah->caps.hw_caps &ATH9K_HW_CAP_RFSILENT ) -ath9k_enable_rfkill (ah); +ath9k_hw_cfg_gpio_input (ah, ah->rfkill_gpio);ath9k_hw_init_global_settings (ah);
drivers/net/wireless/ath/ath9k/hw.h +0 -1
@@ -576,7 +576,6 @@ struct ath_hw_private_ops {void (*set_delta_slope)(struct ath_hw *ah,struct ath9k_channel *chan);bool (*rfbus_req)(struct ath_hw *ah);void (*rfbus_done)(struct ath_hw *ah); -void (*enable_rfkill)(struct ath_hw *ah);void (*restore_chainmask)(struct ath_hw *ah);void (*set_diversity)(struct ath_hw *ah,bool value); u32 (*compute_pll_control)(struct ath_hw *ah,
Signature · 1 line
1.7.3.2