From: Felix Fietkau Date: Mon, 29 Jul 2013 19:44:05 +0000 (+0000) Subject: ath9k: fix several issues in the tx queueing rework X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=36e6d4ca53495970956c697c8549d16ceb998242;p=openwrt%2Fstaging%2Fstintel.git ath9k: fix several issues in the tx queueing rework Signed-off-by: Felix Fietkau SVN-Revision: 37616 --- diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch index c557460381..5e8d421aa5 100644 --- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch +++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch @@ -45,7 +45,7 @@ DRM_KMS_HELPER= --- a/Kconfig +++ b/Kconfig -@@ -31,9 +31,6 @@ source drivers/net/wireless/Kconfig +@@ -33,9 +33,6 @@ source drivers/net/wireless/Kconfig source drivers/net/ethernet/Kconfig source drivers/net/usb/Kconfig diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch index 649c120ad3..120fc4c1fc 100644 --- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch +++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch @@ -1,8 +1,6 @@ -Index: compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/hw.c -=================================================================== ---- compat-wireless-2013-06-27.orig/drivers/net/wireless/ath/ath9k/hw.c 2013-07-25 20:17:32.375285640 +0200 -+++ compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/hw.c 2013-07-25 20:19:20.131288207 +0200 -@@ -729,6 +729,7 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -729,6 +729,7 @@ int ath9k_hw_init(struct ath_hw *ah) case AR9300_DEVID_AR9462: case AR9485_DEVID_AR1111: case AR9300_DEVID_AR9565: @@ -10,10 +8,8 @@ Index: compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/hw.c break; default: if (common->bus_ops->ath_bus_type == ATH_USB) -Index: compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/hw.h -=================================================================== ---- compat-wireless-2013-06-27.orig/drivers/net/wireless/ath/ath9k/hw.h 2013-07-25 20:17:32.375285640 +0200 -+++ compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/hw.h 2013-07-25 20:19:01.095287753 +0200 +--- a/drivers/net/wireless/ath/ath9k/hw.h ++++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -52,6 +52,7 @@ #define AR9300_DEVID_QCA955X 0x0038 #define AR9485_DEVID_AR1111 0x0037 @@ -22,11 +18,9 @@ Index: compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/hw.h #define AR5416_AR9100_DEVID 0x000b -Index: compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/pci.c -=================================================================== ---- compat-wireless-2013-06-27.orig/drivers/net/wireless/ath/ath9k/pci.c 2013-06-30 16:34:53.000000000 +0200 -+++ compat-wireless-2013-06-27/drivers/net/wireless/ath/ath9k/pci.c 2013-07-25 20:19:41.815288724 +0200 -@@ -139,6 +139,7 @@ +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -139,6 +139,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i { PCI_VDEVICE(ATHEROS, 0x0034) }, /* PCI-E AR9462 */ { PCI_VDEVICE(ATHEROS, 0x0037) }, /* PCI-E AR1111/AR9485 */ { PCI_VDEVICE(ATHEROS, 0x0036) }, /* PCI-E AR9565 */ diff --git a/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch b/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch index 8f48eea3ad..2b22c1d90b 100644 --- a/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch +++ b/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch @@ -10,7 +10,7 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2847,7 +2847,7 @@ void ath9k_hw_apply_txpower(struct ath_h +@@ -2848,7 +2848,7 @@ void ath9k_hw_apply_txpower(struct ath_h channel = chan->chan; chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER); new_pwr = min_t(int, chan_pwr, reg->power_limit); diff --git a/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch index 7cf1c2a3fd..06b1e1013c 100644 --- a/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch +++ b/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch @@ -62,7 +62,7 @@ debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc, --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -499,6 +499,12 @@ enum { +@@ -500,6 +500,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -777,6 +783,8 @@ struct ath_hw { +@@ -778,6 +784,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1027,6 +1035,7 @@ void ath9k_hw_set_sta_beacon_timers(stru +@@ -1028,6 +1036,7 @@ void ath9k_hw_set_sta_beacon_timers(stru bool ath9k_hw_check_alive(struct ath_hw *ah); bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode); @@ -94,7 +94,7 @@ void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause); --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1853,6 +1853,20 @@ fail: +@@ -1854,6 +1854,20 @@ fail: return -EINVAL; } @@ -115,7 +115,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, struct ath9k_hw_cal_data *caldata, bool fastcc) { -@@ -2055,6 +2069,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -2056,6 +2070,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st } ath9k_hw_apply_gpio_override(ah); diff --git a/package/kernel/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch b/package/kernel/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch index 584a7d70ce..c5b90af68c 100644 --- a/package/kernel/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch +++ b/package/kernel/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch @@ -12,7 +12,7 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2448,17 +2448,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -2449,17 +2449,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw } eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE); @@ -48,7 +48,7 @@ AR_SREV_9285(ah) || --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -947,6 +947,8 @@ struct ath_hw { +@@ -948,6 +948,8 @@ struct ath_hw { bool is_clk_25mhz; int (*get_mac_revision)(void); int (*external_reset)(void); diff --git a/package/kernel/mac80211/patches/566-ath9k_prepare_tid_queueing.patch b/package/kernel/mac80211/patches/566-ath9k_prepare_tid_queueing.patch index 65e4be3e5d..b8e75a0ba1 100644 --- a/package/kernel/mac80211/patches/566-ath9k_prepare_tid_queueing.patch +++ b/package/kernel/mac80211/patches/566-ath9k_prepare_tid_queueing.patch @@ -1,6 +1,49 @@ --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -1328,7 +1328,7 @@ void ath_tx_aggr_stop(struct ath_softc * +@@ -672,7 +672,7 @@ static void ath_tx_process_buffer(struct + } else + ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok); + +- if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !flush) ++ if (!flush) + ath_txq_schedule(sc, txq); + } + +@@ -848,6 +848,7 @@ static struct ath_buf * + ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq, + struct ath_atx_tid *tid, struct sk_buff_head **q) + { ++ struct ieee80211_tx_info *tx_info; + struct ath_frame_info *fi; + struct sk_buff *skb; + struct ath_buf *bf; +@@ -874,6 +875,16 @@ ath_tx_get_tid_subframe(struct ath_softc + continue; + } + ++ bf->bf_next = NULL; ++ bf->bf_lastbf = bf; ++ ++ tx_info = IEEE80211_SKB_CB(skb); ++ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; ++ if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { ++ bf->bf_state.bf_type = 0; ++ return bf; ++ } ++ + bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR; + seqno = bf->bf_state.seqno; + +@@ -893,8 +904,6 @@ ath_tx_get_tid_subframe(struct ath_softc + continue; + } + +- bf->bf_next = NULL; +- bf->bf_lastbf = bf; + return bf; + } + +@@ -1328,7 +1337,7 @@ void ath_tx_aggr_stop(struct ath_softc * ath_txq_lock(sc, txq); txtid->active = false; @@ -9,3 +52,25 @@ ath_tx_flush_tid(sc, txtid); ath_txq_unlock_complete(sc, txq); } +@@ -2397,8 +2406,7 @@ static void ath_tx_processq(struct ath_s + + if (list_empty(&txq->axq_q)) { + txq->axq_link = NULL; +- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) +- ath_txq_schedule(sc, txq); ++ ath_txq_schedule(sc, txq); + break; + } + bf = list_first_entry(&txq->axq_q, struct ath_buf, list); +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -1403,9 +1403,6 @@ static void ath9k_sta_notify(struct ieee + struct ath_softc *sc = hw->priv; + struct ath_node *an = (struct ath_node *) sta->drv_priv; + +- if (!sta->ht_cap.ht_supported) +- return; +- + switch (cmd) { + case STA_NOTIFY_SLEEP: + an->sleeping = true; diff --git a/package/kernel/mac80211/patches/567-ath9k_tid_active_check.patch b/package/kernel/mac80211/patches/567-ath9k_tid_active_check.patch new file mode 100644 index 0000000000..ae01f183fd --- /dev/null +++ b/package/kernel/mac80211/patches/567-ath9k_tid_active_check.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -520,7 +520,8 @@ static void ath_tx_complete_aggr(struct + tx_info = IEEE80211_SKB_CB(skb); + fi = get_frame_info(skb); + +- if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) { ++ if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno) || ++ !tid->active) { + /* + * Outside of the current BlockAck window, + * maybe part of a previous session diff --git a/package/kernel/mac80211/patches/567-ath9k_tid_queue_non_aggr.patch b/package/kernel/mac80211/patches/567-ath9k_tid_queue_non_aggr.patch deleted file mode 100644 index 4835a9c2ed..0000000000 --- a/package/kernel/mac80211/patches/567-ath9k_tid_queue_non_aggr.patch +++ /dev/null @@ -1,384 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -672,7 +672,7 @@ static void ath_tx_process_buffer(struct - } else - ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok); - -- if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !flush) -+ if (!flush) - ath_txq_schedule(sc, txq); - } - -@@ -848,6 +848,7 @@ static struct ath_buf * - ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq, - struct ath_atx_tid *tid, struct sk_buff_head **q) - { -+ struct ieee80211_tx_info *tx_info; - struct ath_frame_info *fi; - struct sk_buff *skb; - struct ath_buf *bf; -@@ -874,6 +875,16 @@ ath_tx_get_tid_subframe(struct ath_softc - continue; - } - -+ bf->bf_next = NULL; -+ bf->bf_lastbf = bf; -+ -+ tx_info = IEEE80211_SKB_CB(skb); -+ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; -+ if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { -+ bf->bf_state.bf_type = 0; -+ return bf; -+ } -+ - bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR; - seqno = bf->bf_state.seqno; - -@@ -893,58 +904,45 @@ ath_tx_get_tid_subframe(struct ath_softc - continue; - } - -- bf->bf_next = NULL; -- bf->bf_lastbf = bf; - return bf; - } - - return NULL; - } - --static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc, -- struct ath_txq *txq, -- struct ath_atx_tid *tid, -- struct list_head *bf_q, -- int *aggr_len) -+static bool -+ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq, -+ struct ath_atx_tid *tid, struct list_head *bf_q, -+ struct ath_buf *bf_first, struct sk_buff_head *tid_q, -+ int *aggr_len) - { - #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4) -- struct ath_buf *bf, *bf_first = NULL, *bf_prev = NULL; -+ struct ath_buf *bf = bf_first, *bf_prev = NULL; - int nframes = 0, ndelim; - u16 aggr_limit = 0, al = 0, bpad = 0, - al_delta, h_baw = tid->baw_size / 2; -- enum ATH_AGGR_STATUS status = ATH_AGGR_DONE; - struct ieee80211_tx_info *tx_info; - struct ath_frame_info *fi; - struct sk_buff *skb; -- struct sk_buff_head *tid_q; -+ bool closed = false; - -- do { -- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); -- if (!bf) { -- status = ATH_AGGR_BAW_CLOSED; -- break; -- } -+ bf = bf_first; -+ aggr_limit = ath_lookup_rate(sc, bf, tid); - -+ do { - skb = bf->bf_mpdu; - fi = get_frame_info(skb); - -- if (!bf_first) { -- bf_first = bf; -- ath_set_rates(tid->an->vif, tid->an->sta, bf); -- aggr_limit = ath_lookup_rate(sc, bf, tid); -- } -- - /* do not exceed aggregation limit */ - al_delta = ATH_AGGR_DELIM_SZ + fi->framelen; - if (nframes) { - if (aggr_limit < al + bpad + al_delta || -- ath_lookup_legacy(bf) || nframes >= h_baw) { -- status = ATH_AGGR_LIMITED; -+ ath_lookup_legacy(bf) || nframes >= h_baw) - break; -- } - - tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); -- if (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) -+ if ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) || -+ !(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) - break; - } - -@@ -974,11 +972,26 @@ static enum ATH_AGGR_STATUS ath_tx_form_ - - bf_prev = bf; - -+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); -+ if (!bf) { -+ closed = true; -+ break; -+ } - } while (ath_tid_has_buffered(tid)); - -+ bf = bf_first; -+ bf->bf_lastbf = bf_prev; -+ -+ if (bf == bf_prev) { -+ al = get_frame_info(bf->bf_mpdu)->framelen; -+ bf->bf_state.bf_type = BUF_AMPDU; -+ } else { -+ TX_STAT_INC(txq->axq_qnum, a_aggr); -+ } -+ - *aggr_len = al; - -- return status; -+ return closed; - #undef PADBYTES - } - -@@ -1239,14 +1252,45 @@ static void ath_tx_fill_desc(struct ath_ - } - } - -+static void -+ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq, -+ struct ath_atx_tid *tid, struct list_head *bf_q, -+ struct ath_buf *bf_first, struct sk_buff_head *tid_q) -+{ -+ struct ath_buf *bf = bf_first, *bf_prev = NULL; -+ struct sk_buff *skb; -+ int nframes = 0; -+ -+ do { -+ skb = bf->bf_mpdu; -+ -+ nframes++; -+ __skb_unlink(skb, tid_q); -+ list_add_tail(&bf->list, bf_q); -+ if (bf_prev) -+ bf_prev->bf_next = bf; -+ bf_prev = bf; -+ -+ if (nframes >= 2) -+ break; -+ -+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); -+ if (!bf) -+ break; -+ -+ ath_set_rates(tid->an->vif, tid->an->sta, bf); -+ } while (1); -+} -+ - static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, - struct ath_atx_tid *tid) - { - struct ath_buf *bf; -- enum ATH_AGGR_STATUS status; - struct ieee80211_tx_info *tx_info; -+ struct sk_buff_head *tid_q; - struct list_head bf_q; -- int aggr_len; -+ int aggr_len = 0; -+ bool aggr, last = true; - - do { - if (!ath_tid_has_buffered(tid)) -@@ -1254,38 +1298,31 @@ static void ath_tx_sched_aggr(struct ath - - INIT_LIST_HEAD(&bf_q); - -- status = ath_tx_form_aggr(sc, txq, tid, &bf_q, &aggr_len); -- -- /* -- * no frames picked up to be aggregated; -- * block-ack window is not open. -- */ -- if (list_empty(&bf_q)) -+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); -+ if (!bf) - break; - -- bf = list_first_entry(&bf_q, struct ath_buf, list); -- bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list); - tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); -+ aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU); -+ if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) || -+ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) -+ break; -+ -+ ath_set_rates(tid->an->vif, tid->an->sta, bf); -+ if (aggr) -+ last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf, -+ tid_q, &aggr_len); -+ else -+ ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); - - if (tid->ac->clear_ps_filter) { - tid->ac->clear_ps_filter = false; - tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; -- } else { -- tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; -- } -- -- /* if only one frame, send as non-aggregate */ -- if (bf == bf->bf_lastbf) { -- aggr_len = get_frame_info(bf->bf_mpdu)->framelen; -- bf->bf_state.bf_type = BUF_AMPDU; -- } else { -- TX_STAT_INC(txq->axq_qnum, a_aggr); - } - - ath_tx_fill_desc(sc, bf, txq, aggr_len); - ath_tx_txqaddbuf(sc, txq, &bf_q, false); -- } while (txq->axq_ampdu_depth < ATH_AGGR_MIN_QDEPTH && -- status != ATH_AGGR_BAW_CLOSED); -+ } while (!last); - } - - int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, -@@ -1844,58 +1881,6 @@ static void ath_tx_txqaddbuf(struct ath_ - } - } - --static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_txq *txq, -- struct ath_atx_tid *tid, struct sk_buff *skb, -- struct ath_tx_control *txctl) --{ -- struct ath_frame_info *fi = get_frame_info(skb); -- struct list_head bf_head; -- struct ath_buf *bf; -- -- /* -- * Do not queue to h/w when any of the following conditions is true: -- * - there are pending frames in software queue -- * - the TID is currently paused for ADDBA/BAR request -- * - seqno is not within block-ack window -- * - h/w queue depth exceeds low water mark -- */ -- if ((ath_tid_has_buffered(tid) || tid->paused || -- !BAW_WITHIN(tid->seq_start, tid->baw_size, tid->seq_next) || -- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) && -- txq != sc->tx.uapsdq) { -- /* -- * Add this frame to software queue for scheduling later -- * for aggregation. -- */ -- TX_STAT_INC(txq->axq_qnum, a_queued_sw); -- __skb_queue_tail(&tid->buf_q, skb); -- if (!txctl->an || !txctl->an->sleeping) -- ath_tx_queue_tid(txq, tid); -- return; -- } -- -- bf = ath_tx_setup_buffer(sc, txq, tid, skb); -- if (!bf) { -- ath_txq_skb_done(sc, txq, skb); -- ieee80211_free_txskb(sc->hw, skb); -- return; -- } -- -- ath_set_rates(tid->an->vif, tid->an->sta, bf); -- bf->bf_state.bf_type = BUF_AMPDU; -- INIT_LIST_HEAD(&bf_head); -- list_add(&bf->list, &bf_head); -- -- /* Add sub-frame to BAW */ -- ath_tx_addto_baw(sc, tid, bf); -- -- /* Queue to h/w without aggregation */ -- TX_STAT_INC(txq->axq_qnum, a_queued_hw); -- bf->bf_lastbf = bf; -- ath_tx_fill_desc(sc, bf, txq, fi->framelen); -- ath_tx_txqaddbuf(sc, txq, &bf_head, false); --} -- - static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, - struct ath_atx_tid *tid, struct sk_buff *skb) - { -@@ -2121,20 +2106,25 @@ int ath_tx_start(struct ieee80211_hw *hw - ath_txq_unlock(sc, txq); - txq = sc->tx.uapsdq; - ath_txq_lock(sc, txq); -- } -- -- if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) { -+ } else if (txctl->an && -+ ieee80211_is_data_present(hdr->frame_control)) { - tid = ath_get_skb_tid(sc, txctl->an, skb); - - WARN_ON(tid->ac->txq != txctl->txq); -- } - -- if ((info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { -+ if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT) -+ tid->ac->clear_ps_filter = true; -+ - /* -- * Try aggregation if it's a unicast data frame -- * and the destination is HT capable. -+ * Add this frame to software queue for scheduling later -+ * for aggregation. - */ -- ath_tx_send_ampdu(sc, txq, tid, skb, txctl); -+ TX_STAT_INC(txq->axq_qnum, a_queued_sw); -+ __skb_queue_tail(&tid->buf_q, skb); -+ if (!txctl->an->sleeping) -+ ath_tx_queue_tid(txq, tid); -+ -+ ath_txq_schedule(sc, txq); - goto out; - } - -@@ -2397,8 +2387,7 @@ static void ath_tx_processq(struct ath_s - - if (list_empty(&txq->axq_q)) { - txq->axq_link = NULL; -- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) -- ath_txq_schedule(sc, txq); -+ ath_txq_schedule(sc, txq); - break; - } - bf = list_first_entry(&txq->axq_q, struct ath_buf, list); -@@ -2628,6 +2617,7 @@ void ath_tx_node_init(struct ath_softc * - for (acno = 0, ac = &an->ac[acno]; - acno < IEEE80211_NUM_ACS; acno++, ac++) { - ac->sched = false; -+ ac->clear_ps_filter = true; - ac->txq = sc->tx.txq_map[acno]; - INIT_LIST_HEAD(&ac->tid_q); - } ---- a/drivers/net/wireless/ath/ath9k/ath9k.h -+++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -137,6 +137,8 @@ int ath_descdma_setup(struct ath_softc * - #define ATH_AGGR_ENCRYPTDELIM 10 - /* minimum h/w qdepth to be sustained to maximize aggregation */ - #define ATH_AGGR_MIN_QDEPTH 2 -+/* minimum h/w qdepth for non-aggregated traffic */ -+#define ATH_NON_AGGR_MIN_QDEPTH 8 - - #define IEEE80211_SEQ_SEQ_SHIFT 4 - #define IEEE80211_SEQ_MAX 4096 -@@ -173,12 +175,6 @@ int ath_descdma_setup(struct ath_softc * - - #define ATH_TX_COMPLETE_POLL_INT 1000 - --enum ATH_AGGR_STATUS { -- ATH_AGGR_DONE, -- ATH_AGGR_BAW_CLOSED, -- ATH_AGGR_LIMITED, --}; -- - #define ATH_TXFIFO_DEPTH 8 - struct ath_txq { - int mac80211_qnum; /* mac80211 queue number, -1 means not mac80211 Q */ ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1403,9 +1403,6 @@ static void ath9k_sta_notify(struct ieee - struct ath_softc *sc = hw->priv; - struct ath_node *an = (struct ath_node *) sta->drv_priv; - -- if (!sta->ht_cap.ht_supported) -- return; -- - switch (cmd) { - case STA_NOTIFY_SLEEP: - an->sleeping = true; diff --git a/package/kernel/mac80211/patches/568-ath9k_tid_fairness.patch b/package/kernel/mac80211/patches/568-ath9k_tid_fairness.patch deleted file mode 100644 index 6512cf04a0..0000000000 --- a/package/kernel/mac80211/patches/568-ath9k_tid_fairness.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -1282,8 +1282,8 @@ ath_tx_form_burst(struct ath_softc *sc, - } while (1); - } - --static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, -- struct ath_atx_tid *tid) -+static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, -+ struct ath_atx_tid *tid, bool *stop) - { - struct ath_buf *bf; - struct ieee80211_tx_info *tx_info; -@@ -1292,37 +1292,36 @@ static void ath_tx_sched_aggr(struct ath - int aggr_len = 0; - bool aggr, last = true; - -- do { -- if (!ath_tid_has_buffered(tid)) -- return; -- -- INIT_LIST_HEAD(&bf_q); -+ if (!ath_tid_has_buffered(tid)) -+ return false; - -- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); -- if (!bf) -- break; -- -- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); -- aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU); -- if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) || -- (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) -- break; -+ INIT_LIST_HEAD(&bf_q); - -- ath_set_rates(tid->an->vif, tid->an->sta, bf); -- if (aggr) -- last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf, -- tid_q, &aggr_len); -- else -- ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); -+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); -+ if (!bf) -+ return false; -+ -+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); -+ aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU); -+ if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) || -+ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) -+ return false; -+ -+ ath_set_rates(tid->an->vif, tid->an->sta, bf); -+ if (aggr) -+ last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf, -+ tid_q, &aggr_len); -+ else -+ ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); - -- if (tid->ac->clear_ps_filter) { -- tid->ac->clear_ps_filter = false; -- tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; -- } -+ if (tid->ac->clear_ps_filter) { -+ tid->ac->clear_ps_filter = false; -+ tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; -+ } - -- ath_tx_fill_desc(sc, bf, txq, aggr_len); -- ath_tx_txqaddbuf(sc, txq, &bf_q, false); -- } while (!last); -+ ath_tx_fill_desc(sc, bf, txq, aggr_len); -+ ath_tx_txqaddbuf(sc, txq, &bf_q, false); -+ return true; - } - - int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, -@@ -1754,8 +1753,9 @@ void ath_tx_cleanupq(struct ath_softc *s - */ - void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) - { -- struct ath_atx_ac *ac, *ac_tmp, *last_ac; -+ struct ath_atx_ac *ac, *last_ac; - struct ath_atx_tid *tid, *last_tid; -+ bool sent = false; - - if (test_bit(SC_OP_HW_RESET, &sc->sc_flags) || - list_empty(&txq->axq_acq) || -@@ -1764,15 +1764,17 @@ void ath_txq_schedule(struct ath_softc * - - rcu_read_lock(); - -- ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list); - last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list); -+ while (!list_empty(&txq->axq_acq)) { -+ bool stop = false; - -- list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) { -+ ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list); - last_tid = list_entry(ac->tid_q.prev, struct ath_atx_tid, list); - list_del(&ac->list); - ac->sched = false; - - while (!list_empty(&ac->tid_q)) { -+ - tid = list_first_entry(&ac->tid_q, struct ath_atx_tid, - list); - list_del(&tid->list); -@@ -1781,7 +1783,8 @@ void ath_txq_schedule(struct ath_softc * - if (tid->paused) - continue; - -- ath_tx_sched_aggr(sc, txq, tid); -+ if (ath_tx_sched_aggr(sc, txq, tid, &stop)) -+ sent = true; - - /* - * add tid to round-robin queue if more frames -@@ -1790,8 +1793,7 @@ void ath_txq_schedule(struct ath_softc * - if (ath_tid_has_buffered(tid)) - ath_tx_queue_tid(txq, tid); - -- if (tid == last_tid || -- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) -+ if (stop || tid == last_tid) - break; - } - -@@ -1800,9 +1802,17 @@ void ath_txq_schedule(struct ath_softc * - list_add_tail(&ac->list, &txq->axq_acq); - } - -- if (ac == last_ac || -- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) -+ if (stop) - break; -+ -+ if (ac == last_ac) { -+ if (!sent) -+ break; -+ -+ sent = false; -+ last_ac = list_entry(txq->axq_acq.prev, -+ struct ath_atx_ac, list); -+ } - } - - rcu_read_unlock(); diff --git a/package/kernel/mac80211/patches/568-ath9k_tid_init_clear_ps_filt.patch b/package/kernel/mac80211/patches/568-ath9k_tid_init_clear_ps_filt.patch new file mode 100644 index 0000000000..d995683c4d --- /dev/null +++ b/package/kernel/mac80211/patches/568-ath9k_tid_init_clear_ps_filt.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -2637,6 +2637,7 @@ void ath_tx_node_init(struct ath_softc * + for (acno = 0, ac = &an->ac[acno]; + acno < IEEE80211_NUM_ACS; acno++, ac++) { + ac->sched = false; ++ ac->clear_ps_filter = true; + ac->txq = sc->tx.txq_map[acno]; + INIT_LIST_HEAD(&ac->tid_q); + } diff --git a/package/kernel/mac80211/patches/569-ath9k_multicast_node.patch b/package/kernel/mac80211/patches/569-ath9k_multicast_node.patch deleted file mode 100644 index 60a543bc08..0000000000 --- a/package/kernel/mac80211/patches/569-ath9k_multicast_node.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/ath9k.h -+++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -265,6 +265,7 @@ struct ath_node { - u8 mpdudensity; - - bool sleeping; -+ bool no_ps_filter; - - #if defined(CPTCFG_MAC80211_DEBUGFS) && defined(CPTCFG_ATH9K_DEBUGFS) - struct dentry *node_stat; -@@ -364,6 +365,7 @@ void ath9k_release_buffered_frames(struc - /********/ - - struct ath_vif { -+ struct ath_node mcast_node; - int av_bslot; - bool primary_sta_vif; - __le64 tsf_adjust; /* TSF adjustment for staggered beacons */ ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -971,6 +971,8 @@ static int ath9k_add_interface(struct ie - struct ath_softc *sc = hw->priv; - struct ath_hw *ah = sc->sc_ah; - struct ath_common *common = ath9k_hw_common(ah); -+ struct ath_vif *avp = (void *)vif->drv_priv; -+ struct ath_node *an = &avp->mcast_node; - - mutex_lock(&sc->mutex); - -@@ -984,6 +986,12 @@ static int ath9k_add_interface(struct ie - if (ath9k_uses_beacons(vif->type)) - ath9k_beacon_assign_slot(sc, vif); - -+ an->sc = sc; -+ an->sta = NULL; -+ an->vif = vif; -+ an->no_ps_filter = true; -+ ath_tx_node_init(sc, an); -+ - mutex_unlock(&sc->mutex); - return 0; - } -@@ -1021,6 +1029,7 @@ static void ath9k_remove_interface(struc - { - struct ath_softc *sc = hw->priv; - struct ath_common *common = ath9k_hw_common(sc->sc_ah); -+ struct ath_vif *avp = (void *)vif->drv_priv; - - ath_dbg(common, CONFIG, "Detach Interface\n"); - -@@ -1035,6 +1044,8 @@ static void ath9k_remove_interface(struc - ath9k_calculate_summary_state(hw, NULL); - ath9k_ps_restore(sc); - -+ ath_tx_node_cleanup(sc, &avp->mcast_node); -+ - mutex_unlock(&sc->mutex); - } - ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -135,6 +135,9 @@ static struct ath_frame_info *get_frame_ - - static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno) - { -+ if (!tid->an->sta) -+ return; -+ - ieee80211_send_bar(tid->an->vif, tid->an->sta->addr, tid->tidno, - seqno << IEEE80211_SEQ_SEQ_SHIFT); - } -@@ -1314,7 +1317,7 @@ static bool ath_tx_sched_aggr(struct ath - else - ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); - -- if (tid->ac->clear_ps_filter) { -+ if (tid->ac->clear_ps_filter || tid->an->no_ps_filter) { - tid->ac->clear_ps_filter = false; - tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; - } -@@ -1500,7 +1503,7 @@ void ath9k_release_buffered_frames(struc - sent++; - TX_STAT_INC(txq->axq_qnum, a_queued_hw); - -- if (ath_tid_has_buffered(tid)) -+ if (an->sta && ath_tid_has_buffered(tid)) - ieee80211_sta_set_buffered(an->sta, i, false); - } - ath_txq_unlock_complete(sc, tid->ac->txq); -@@ -2033,6 +2036,7 @@ static int ath_tx_prepare(struct ieee802 - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_sta *sta = txctl->sta; - struct ieee80211_vif *vif = info->control.vif; -+ struct ath_vif *avp; - struct ath_softc *sc = hw->priv; - int frmlen = skb->len + FCS_LEN; - int padpos, padsize; -@@ -2040,6 +2044,10 @@ static int ath_tx_prepare(struct ieee802 - /* NOTE: sta can be NULL according to net/mac80211.h */ - if (sta) - txctl->an = (struct ath_node *)sta->drv_priv; -+ else if (vif && ieee80211_is_data(hdr->frame_control)) { -+ avp = (void *)vif->drv_priv; -+ txctl->an = &avp->mcast_node; -+ } - - if (info->control.hw_key) - frmlen += info->control.hw_key->icv_len; diff --git a/package/kernel/mac80211/patches/570-ath9k_tid_queue_non_aggr.patch b/package/kernel/mac80211/patches/570-ath9k_tid_queue_non_aggr.patch new file mode 100644 index 0000000000..690c90972c --- /dev/null +++ b/package/kernel/mac80211/patches/570-ath9k_tid_queue_non_aggr.patch @@ -0,0 +1,416 @@ +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -198,6 +198,41 @@ static struct sk_buff *ath_tid_dequeue(s + return skb; + } + ++/* ++ * ath_tx_tid_change_state: ++ * - clears a-mpdu flag of previous session ++ * - force sequence number allocation to fix next BlockAck Window ++ */ ++static void ++ath_tx_tid_change_state(struct ath_softc *sc, struct ath_atx_tid *tid) ++{ ++ struct ath_txq *txq = tid->ac->txq; ++ struct ieee80211_tx_info *tx_info; ++ struct sk_buff *skb, *tskb; ++ struct ath_buf *bf; ++ struct ath_frame_info *fi; ++ ++ skb_queue_walk_safe(&tid->buf_q, skb, tskb) { ++ fi = get_frame_info(skb); ++ bf = fi->bf; ++ ++ tx_info = IEEE80211_SKB_CB(skb); ++ tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU; ++ ++ if (bf) ++ continue; ++ ++ bf = ath_tx_setup_buffer(sc, txq, tid, skb); ++ if (!bf) { ++ __skb_unlink(skb, &tid->buf_q); ++ ath_txq_skb_done(sc, txq, skb); ++ ieee80211_free_txskb(sc->hw, skb); ++ continue; ++ } ++ } ++ ++} ++ + static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) + { + struct ath_txq *txq = tid->ac->txq; +@@ -212,28 +247,22 @@ static void ath_tx_flush_tid(struct ath_ + + memset(&ts, 0, sizeof(ts)); + +- while ((skb = ath_tid_dequeue(tid))) { ++ while ((skb = __skb_dequeue(&tid->retry_q))) { + fi = get_frame_info(skb); + bf = fi->bf; +- + if (!bf) { +- bf = ath_tx_setup_buffer(sc, txq, tid, skb); +- if (!bf) { +- ath_txq_skb_done(sc, txq, skb); +- ieee80211_free_txskb(sc->hw, skb); +- continue; +- } ++ ath_txq_skb_done(sc, txq, skb); ++ ieee80211_free_txskb(sc->hw, skb); ++ continue; + } + + if (fi->baw_tracked) { +- list_add_tail(&bf->list, &bf_head); + ath_tx_update_baw(sc, tid, bf->bf_state.seqno); +- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0); + sendbar = true; +- } else { +- ath_set_rates(tid->an->vif, tid->an->sta, bf); +- ath_tx_send_normal(sc, txq, NULL, skb); + } ++ ++ list_add_tail(&bf->list, &bf_head); ++ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0); + } + + if (sendbar) { +@@ -911,50 +940,39 @@ ath_tx_get_tid_subframe(struct ath_softc + return NULL; + } + +-static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc, +- struct ath_txq *txq, +- struct ath_atx_tid *tid, +- struct list_head *bf_q, +- int *aggr_len) ++static bool ++ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq, ++ struct ath_atx_tid *tid, struct list_head *bf_q, ++ struct ath_buf *bf_first, struct sk_buff_head *tid_q, ++ int *aggr_len) + { + #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4) +- struct ath_buf *bf, *bf_first = NULL, *bf_prev = NULL; ++ struct ath_buf *bf = bf_first, *bf_prev = NULL; + int nframes = 0, ndelim; + u16 aggr_limit = 0, al = 0, bpad = 0, + al_delta, h_baw = tid->baw_size / 2; +- enum ATH_AGGR_STATUS status = ATH_AGGR_DONE; + struct ieee80211_tx_info *tx_info; + struct ath_frame_info *fi; + struct sk_buff *skb; +- struct sk_buff_head *tid_q; ++ bool closed = false; + +- do { +- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); +- if (!bf) { +- status = ATH_AGGR_BAW_CLOSED; +- break; +- } ++ bf = bf_first; ++ aggr_limit = ath_lookup_rate(sc, bf, tid); + ++ do { + skb = bf->bf_mpdu; + fi = get_frame_info(skb); + +- if (!bf_first) { +- bf_first = bf; +- ath_set_rates(tid->an->vif, tid->an->sta, bf); +- aggr_limit = ath_lookup_rate(sc, bf, tid); +- } +- + /* do not exceed aggregation limit */ + al_delta = ATH_AGGR_DELIM_SZ + fi->framelen; + if (nframes) { + if (aggr_limit < al + bpad + al_delta || +- ath_lookup_legacy(bf) || nframes >= h_baw) { +- status = ATH_AGGR_LIMITED; ++ ath_lookup_legacy(bf) || nframes >= h_baw) + break; +- } + + tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); +- if (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) ++ if ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) || ++ !(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) + break; + } + +@@ -984,11 +1002,26 @@ static enum ATH_AGGR_STATUS ath_tx_form_ + + bf_prev = bf; + ++ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); ++ if (!bf) { ++ closed = true; ++ break; ++ } + } while (ath_tid_has_buffered(tid)); + ++ bf = bf_first; ++ bf->bf_lastbf = bf_prev; ++ ++ if (bf == bf_prev) { ++ al = get_frame_info(bf->bf_mpdu)->framelen; ++ bf->bf_state.bf_type = BUF_AMPDU; ++ } else { ++ TX_STAT_INC(txq->axq_qnum, a_aggr); ++ } ++ + *aggr_len = al; + +- return status; ++ return closed; + #undef PADBYTES + } + +@@ -1249,14 +1282,50 @@ static void ath_tx_fill_desc(struct ath_ + } + } + ++static void ++ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq, ++ struct ath_atx_tid *tid, struct list_head *bf_q, ++ struct ath_buf *bf_first, struct sk_buff_head *tid_q) ++{ ++ struct ath_buf *bf = bf_first, *bf_prev = NULL; ++ struct sk_buff *skb; ++ int nframes = 0; ++ ++ do { ++ struct ieee80211_tx_info *tx_info; ++ skb = bf->bf_mpdu; ++ ++ nframes++; ++ __skb_unlink(skb, tid_q); ++ list_add_tail(&bf->list, bf_q); ++ if (bf_prev) ++ bf_prev->bf_next = bf; ++ bf_prev = bf; ++ ++ if (nframes >= 2) ++ break; ++ ++ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); ++ if (!bf) ++ break; ++ ++ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); ++ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) ++ break; ++ ++ ath_set_rates(tid->an->vif, tid->an->sta, bf); ++ } while (1); ++} ++ + static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, + struct ath_atx_tid *tid) + { + struct ath_buf *bf; +- enum ATH_AGGR_STATUS status; + struct ieee80211_tx_info *tx_info; ++ struct sk_buff_head *tid_q; + struct list_head bf_q; +- int aggr_len; ++ int aggr_len = 0; ++ bool aggr, last = true; + + do { + if (!ath_tid_has_buffered(tid)) +@@ -1264,38 +1333,34 @@ static void ath_tx_sched_aggr(struct ath + + INIT_LIST_HEAD(&bf_q); + +- status = ath_tx_form_aggr(sc, txq, tid, &bf_q, &aggr_len); +- +- /* +- * no frames picked up to be aggregated; +- * block-ack window is not open. +- */ +- if (list_empty(&bf_q)) ++ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); ++ if (!bf) + break; + +- bf = list_first_entry(&bf_q, struct ath_buf, list); +- bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list); + tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); ++ aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU); ++ if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) || ++ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) ++ break; ++ ++ ath_set_rates(tid->an->vif, tid->an->sta, bf); ++ if (aggr) ++ last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf, ++ tid_q, &aggr_len); ++ else ++ ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); ++ ++ if (list_empty(&bf_q)) ++ return; + + if (tid->ac->clear_ps_filter) { + tid->ac->clear_ps_filter = false; + tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; +- } else { +- tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; +- } +- +- /* if only one frame, send as non-aggregate */ +- if (bf == bf->bf_lastbf) { +- aggr_len = get_frame_info(bf->bf_mpdu)->framelen; +- bf->bf_state.bf_type = BUF_AMPDU; +- } else { +- TX_STAT_INC(txq->axq_qnum, a_aggr); + } + + ath_tx_fill_desc(sc, bf, txq, aggr_len); + ath_tx_txqaddbuf(sc, txq, &bf_q, false); +- } while (txq->axq_ampdu_depth < ATH_AGGR_MIN_QDEPTH && +- status != ATH_AGGR_BAW_CLOSED); ++ } while (!last); + } + + int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, +@@ -1319,6 +1384,9 @@ int ath_tx_aggr_start(struct ath_softc * + an->mpdudensity = density; + } + ++ /* force sequence number allocation for pending frames */ ++ ath_tx_tid_change_state(sc, txtid); ++ + txtid->active = true; + txtid->paused = true; + *ssn = txtid->seq_start = txtid->seq_next; +@@ -1340,6 +1408,7 @@ void ath_tx_aggr_stop(struct ath_softc * + txtid->active = false; + txtid->paused = false; + ath_tx_flush_tid(sc, txtid); ++ ath_tx_tid_change_state(sc, txtid); + ath_txq_unlock_complete(sc, txq); + } + +@@ -1854,58 +1923,6 @@ static void ath_tx_txqaddbuf(struct ath_ + } + } + +-static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_txq *txq, +- struct ath_atx_tid *tid, struct sk_buff *skb, +- struct ath_tx_control *txctl) +-{ +- struct ath_frame_info *fi = get_frame_info(skb); +- struct list_head bf_head; +- struct ath_buf *bf; +- +- /* +- * Do not queue to h/w when any of the following conditions is true: +- * - there are pending frames in software queue +- * - the TID is currently paused for ADDBA/BAR request +- * - seqno is not within block-ack window +- * - h/w queue depth exceeds low water mark +- */ +- if ((ath_tid_has_buffered(tid) || tid->paused || +- !BAW_WITHIN(tid->seq_start, tid->baw_size, tid->seq_next) || +- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) && +- txq != sc->tx.uapsdq) { +- /* +- * Add this frame to software queue for scheduling later +- * for aggregation. +- */ +- TX_STAT_INC(txq->axq_qnum, a_queued_sw); +- __skb_queue_tail(&tid->buf_q, skb); +- if (!txctl->an || !txctl->an->sleeping) +- ath_tx_queue_tid(txq, tid); +- return; +- } +- +- bf = ath_tx_setup_buffer(sc, txq, tid, skb); +- if (!bf) { +- ath_txq_skb_done(sc, txq, skb); +- ieee80211_free_txskb(sc->hw, skb); +- return; +- } +- +- ath_set_rates(tid->an->vif, tid->an->sta, bf); +- bf->bf_state.bf_type = BUF_AMPDU; +- INIT_LIST_HEAD(&bf_head); +- list_add(&bf->list, &bf_head); +- +- /* Add sub-frame to BAW */ +- ath_tx_addto_baw(sc, tid, bf); +- +- /* Queue to h/w without aggregation */ +- TX_STAT_INC(txq->axq_qnum, a_queued_hw); +- bf->bf_lastbf = bf; +- ath_tx_fill_desc(sc, bf, txq, fi->framelen); +- ath_tx_txqaddbuf(sc, txq, &bf_head, false); +-} +- + static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, + struct ath_atx_tid *tid, struct sk_buff *skb) + { +@@ -2131,20 +2148,25 @@ int ath_tx_start(struct ieee80211_hw *hw + ath_txq_unlock(sc, txq); + txq = sc->tx.uapsdq; + ath_txq_lock(sc, txq); +- } +- +- if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) { ++ } else if (txctl->an && ++ ieee80211_is_data_present(hdr->frame_control)) { + tid = ath_get_skb_tid(sc, txctl->an, skb); + + WARN_ON(tid->ac->txq != txctl->txq); +- } + +- if ((info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { ++ if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT) ++ tid->ac->clear_ps_filter = true; ++ + /* +- * Try aggregation if it's a unicast data frame +- * and the destination is HT capable. ++ * Add this frame to software queue for scheduling later ++ * for aggregation. + */ +- ath_tx_send_ampdu(sc, txq, tid, skb, txctl); ++ TX_STAT_INC(txq->axq_qnum, a_queued_sw); ++ __skb_queue_tail(&tid->buf_q, skb); ++ if (!txctl->an->sleeping) ++ ath_tx_queue_tid(txq, tid); ++ ++ ath_txq_schedule(sc, txq); + goto out; + } + +--- a/drivers/net/wireless/ath/ath9k/ath9k.h ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h +@@ -137,6 +137,8 @@ int ath_descdma_setup(struct ath_softc * + #define ATH_AGGR_ENCRYPTDELIM 10 + /* minimum h/w qdepth to be sustained to maximize aggregation */ + #define ATH_AGGR_MIN_QDEPTH 2 ++/* minimum h/w qdepth for non-aggregated traffic */ ++#define ATH_NON_AGGR_MIN_QDEPTH 8 + + #define IEEE80211_SEQ_SEQ_SHIFT 4 + #define IEEE80211_SEQ_MAX 4096 +@@ -173,12 +175,6 @@ int ath_descdma_setup(struct ath_softc * + + #define ATH_TX_COMPLETE_POLL_INT 1000 + +-enum ATH_AGGR_STATUS { +- ATH_AGGR_DONE, +- ATH_AGGR_BAW_CLOSED, +- ATH_AGGR_LIMITED, +-}; +- + #define ATH_TXFIFO_DEPTH 8 + struct ath_txq { + int mac80211_qnum; /* mac80211 queue number, -1 means not mac80211 Q */ diff --git a/package/kernel/mac80211/patches/571-ath9k_tid_fairness.patch b/package/kernel/mac80211/patches/571-ath9k_tid_fairness.patch new file mode 100644 index 0000000000..30ae0908ec --- /dev/null +++ b/package/kernel/mac80211/patches/571-ath9k_tid_fairness.patch @@ -0,0 +1,153 @@ +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -1317,8 +1317,8 @@ ath_tx_form_burst(struct ath_softc *sc, + } while (1); + } + +-static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, +- struct ath_atx_tid *tid) ++static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, ++ struct ath_atx_tid *tid, bool *stop) + { + struct ath_buf *bf; + struct ieee80211_tx_info *tx_info; +@@ -1327,40 +1327,39 @@ static void ath_tx_sched_aggr(struct ath + int aggr_len = 0; + bool aggr, last = true; + +- do { +- if (!ath_tid_has_buffered(tid)) +- return; +- +- INIT_LIST_HEAD(&bf_q); +- +- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); +- if (!bf) +- break; ++ if (!ath_tid_has_buffered(tid)) ++ return false; + +- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); +- aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU); +- if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) || +- (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) +- break; ++ INIT_LIST_HEAD(&bf_q); + +- ath_set_rates(tid->an->vif, tid->an->sta, bf); +- if (aggr) +- last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf, +- tid_q, &aggr_len); +- else +- ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); ++ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q); ++ if (!bf) ++ return false; ++ ++ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); ++ aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU); ++ if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) || ++ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) ++ return false; ++ ++ ath_set_rates(tid->an->vif, tid->an->sta, bf); ++ if (aggr) ++ last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf, ++ tid_q, &aggr_len); ++ else ++ ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q); + +- if (list_empty(&bf_q)) +- return; ++ if (list_empty(&bf_q)) ++ return false; + +- if (tid->ac->clear_ps_filter) { +- tid->ac->clear_ps_filter = false; +- tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; +- } ++ if (tid->ac->clear_ps_filter) { ++ tid->ac->clear_ps_filter = false; ++ tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; ++ } + +- ath_tx_fill_desc(sc, bf, txq, aggr_len); +- ath_tx_txqaddbuf(sc, txq, &bf_q, false); +- } while (!last); ++ ath_tx_fill_desc(sc, bf, txq, aggr_len); ++ ath_tx_txqaddbuf(sc, txq, &bf_q, false); ++ return true; + } + + int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, +@@ -1796,8 +1795,9 @@ void ath_tx_cleanupq(struct ath_softc *s + */ + void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) + { +- struct ath_atx_ac *ac, *ac_tmp, *last_ac; ++ struct ath_atx_ac *ac, *last_ac; + struct ath_atx_tid *tid, *last_tid; ++ bool sent = false; + + if (test_bit(SC_OP_HW_RESET, &sc->sc_flags) || + list_empty(&txq->axq_acq) || +@@ -1806,15 +1806,17 @@ void ath_txq_schedule(struct ath_softc * + + rcu_read_lock(); + +- ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list); + last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list); ++ while (!list_empty(&txq->axq_acq)) { ++ bool stop = false; + +- list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) { ++ ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list); + last_tid = list_entry(ac->tid_q.prev, struct ath_atx_tid, list); + list_del(&ac->list); + ac->sched = false; + + while (!list_empty(&ac->tid_q)) { ++ + tid = list_first_entry(&ac->tid_q, struct ath_atx_tid, + list); + list_del(&tid->list); +@@ -1823,7 +1825,8 @@ void ath_txq_schedule(struct ath_softc * + if (tid->paused) + continue; + +- ath_tx_sched_aggr(sc, txq, tid); ++ if (ath_tx_sched_aggr(sc, txq, tid, &stop)) ++ sent = true; + + /* + * add tid to round-robin queue if more frames +@@ -1832,8 +1835,7 @@ void ath_txq_schedule(struct ath_softc * + if (ath_tid_has_buffered(tid)) + ath_tx_queue_tid(txq, tid); + +- if (tid == last_tid || +- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ++ if (stop || tid == last_tid) + break; + } + +@@ -1842,9 +1844,17 @@ void ath_txq_schedule(struct ath_softc * + list_add_tail(&ac->list, &txq->axq_acq); + } + +- if (ac == last_ac || +- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ++ if (stop) + break; ++ ++ if (ac == last_ac) { ++ if (!sent) ++ break; ++ ++ sent = false; ++ last_ac = list_entry(txq->axq_acq.prev, ++ struct ath_atx_ac, list); ++ } + } + + rcu_read_unlock(); diff --git a/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch b/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch new file mode 100644 index 0000000000..cbe3816b12 --- /dev/null +++ b/package/kernel/mac80211/patches/572-ath9k_multicast_node.patch @@ -0,0 +1,108 @@ +--- a/drivers/net/wireless/ath/ath9k/ath9k.h ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h +@@ -265,6 +265,7 @@ struct ath_node { + u8 mpdudensity; + + bool sleeping; ++ bool no_ps_filter; + + #if defined(CPTCFG_MAC80211_DEBUGFS) && defined(CPTCFG_ATH9K_DEBUGFS) + struct dentry *node_stat; +@@ -364,6 +365,7 @@ void ath9k_release_buffered_frames(struc + /********/ + + struct ath_vif { ++ struct ath_node mcast_node; + int av_bslot; + bool primary_sta_vif; + __le64 tsf_adjust; /* TSF adjustment for staggered beacons */ +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -971,6 +971,8 @@ static int ath9k_add_interface(struct ie + struct ath_softc *sc = hw->priv; + struct ath_hw *ah = sc->sc_ah; + struct ath_common *common = ath9k_hw_common(ah); ++ struct ath_vif *avp = (void *)vif->drv_priv; ++ struct ath_node *an = &avp->mcast_node; + + mutex_lock(&sc->mutex); + +@@ -984,6 +986,12 @@ static int ath9k_add_interface(struct ie + if (ath9k_uses_beacons(vif->type)) + ath9k_beacon_assign_slot(sc, vif); + ++ an->sc = sc; ++ an->sta = NULL; ++ an->vif = vif; ++ an->no_ps_filter = true; ++ ath_tx_node_init(sc, an); ++ + mutex_unlock(&sc->mutex); + return 0; + } +@@ -1021,6 +1029,7 @@ static void ath9k_remove_interface(struc + { + struct ath_softc *sc = hw->priv; + struct ath_common *common = ath9k_hw_common(sc->sc_ah); ++ struct ath_vif *avp = (void *)vif->drv_priv; + + ath_dbg(common, CONFIG, "Detach Interface\n"); + +@@ -1035,6 +1044,8 @@ static void ath9k_remove_interface(struc + ath9k_calculate_summary_state(hw, NULL); + ath9k_ps_restore(sc); + ++ ath_tx_node_cleanup(sc, &avp->mcast_node); ++ + mutex_unlock(&sc->mutex); + } + +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -135,6 +135,9 @@ static struct ath_frame_info *get_frame_ + + static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno) + { ++ if (!tid->an->sta) ++ return; ++ + ieee80211_send_bar(tid->an->vif, tid->an->sta->addr, tid->tidno, + seqno << IEEE80211_SEQ_SEQ_SHIFT); + } +@@ -1352,7 +1355,7 @@ static bool ath_tx_sched_aggr(struct ath + if (list_empty(&bf_q)) + return false; + +- if (tid->ac->clear_ps_filter) { ++ if (tid->ac->clear_ps_filter || tid->an->no_ps_filter) { + tid->ac->clear_ps_filter = false; + tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; + } +@@ -1542,7 +1545,7 @@ void ath9k_release_buffered_frames(struc + sent++; + TX_STAT_INC(txq->axq_qnum, a_queued_hw); + +- if (ath_tid_has_buffered(tid)) ++ if (an->sta && ath_tid_has_buffered(tid)) + ieee80211_sta_set_buffered(an->sta, i, false); + } + ath_txq_unlock_complete(sc, tid->ac->txq); +@@ -2075,6 +2078,7 @@ static int ath_tx_prepare(struct ieee802 + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct ieee80211_sta *sta = txctl->sta; + struct ieee80211_vif *vif = info->control.vif; ++ struct ath_vif *avp; + struct ath_softc *sc = hw->priv; + int frmlen = skb->len + FCS_LEN; + int padpos, padsize; +@@ -2082,6 +2086,10 @@ static int ath_tx_prepare(struct ieee802 + /* NOTE: sta can be NULL according to net/mac80211.h */ + if (sta) + txctl->an = (struct ath_node *)sta->drv_priv; ++ else if (vif && ieee80211_is_data(hdr->frame_control)) { ++ avp = (void *)vif->drv_priv; ++ txctl->an = &avp->mcast_node; ++ } + + if (info->control.hw_key) + frmlen += info->control.hw_key->icv_len;