carl9170 firmware: remove CONFIG_CARL9170FW_CAB_QUEUE

[carl9170fw.git] / carlfw / src / wlan.c

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 50c48f9d27d5f440bb5e6a9d5c14eb1719cb7448..3d879bd3c4be5e2a1a06c1a96db4865cd2072a6f 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -345,6 +345,16 @@ static bool wlan_tx_status(struct dma_queue *queue,
        /* update hangcheck */
        fw.wlan.last_super_num[qidx] = 0;
 
+       /*
+        * Note:
+        * There could be a corner case when the TXFAIL is set
+        * even though the frame was properly ACKed by the peer:
+        *   a BlockAckReq with the immediate policy will cause
+        *   the receiving peer to produce a BlockACK unfortunately
+        *   the MAC in this chip seems to be expecting a legacy
+        *   ACK and marks the BAR as failed!
+        */
+
        if (!!(desc->ctrl & AR9170_CTRL_FAIL)) {
                txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL);
 
@@ -442,13 +452,15 @@ static bool wlan_tx_status(struct dma_queue *queue,
                return true;
        }
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
        if (unlikely(super->s.cab))
                fw.wlan.cab_queue_len[super->s.vif_id]--;
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
        wlan_tx_complete(super, success);
 
+       if (ieee80211_is_back_req(super->f.data.i3e.frame_control)) {
+               fw.wlan.queued_bar--;
+       }
+
        /* recycle freed descriptors */
        dma_reclaim(&fw.pta.down_queue, desc);
        down_trigger();
@@ -483,18 +495,20 @@ void __hot wlan_tx(struct dma_desc *desc)
 {
        struct carl9170_tx_superframe *super = DESC_PAYLOAD(desc);
 
+       if (ieee80211_is_back_req(super->f.data.i3e.frame_control)) {
+               fw.wlan.queued_bar++;
+       }
+
        /* initialize rate control struct */
        super->s.rix = 0;
        super->s.cnt = 1;
        hide_super(desc);
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
        if (unlikely(super->s.cab)) {
                fw.wlan.cab_queue_len[super->s.vif_id]++;
                dma_put(&fw.wlan.cab_queue[super->s.vif_id], desc);
                return;
        }
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
        _wlan_tx(desc);
        __wlan_tx(desc);
@@ -554,10 +568,12 @@ static void wlan_send_buffered_ba(void)
        baf->f.hdr.phy.mcs = AR9170_TXRX_PHY_RATE_OFDM_6M;
 
        /* format outgoing BA */
-       ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_NULLFUNC);
+       ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_BACK);
        ba->duration = cpu_to_le16(0);
-       memcpy(ba->ta, ctx->ta, 6);
-       memcpy(ba->ra, ctx->ra, 6);
+
+       /* the BAR contains all necessary MACs. All we need is to swap them */
+       memcpy(ba->ra, ctx->ta, 6);
+       memcpy(ba->ta, ctx->ra, 6);
 
        /*
         * Unfortunately, we cannot look into the hardware's scoreboard.
@@ -567,8 +583,8 @@ static void wlan_send_buffered_ba(void)
        memset(ba->bitmap, 0x0, sizeof(ba->bitmap));
 
        /*
-        * NB:
-        * not entirely sure if this is 100% correct?!
+        * Both, the original firmare and ath9k set the NO ACK flag in
+        * the BA Ack Policy subfield.
         */
        ba->control = ctx->control | cpu_to_le16(1);
        ba->start_seq_num = ctx->start_seq_num;
@@ -622,16 +638,9 @@ static void handle_bar(struct dma_desc *desc __unused, struct ieee80211_hdr *hdr
 
        ctx = wlan_get_bar_cache_buffer();
 
-       /* Brilliant! The BAR provides all necessary MACs! */
-       memcpy(ctx->ra, bar->ta, 6);
-       memcpy(ctx->ta, bar->ra, 6);
-
-       /*
-        * NB:
-        * not entirely sure if this is 100% correct to force the
-        * imm ack bit or not...
-        */
-       ctx->control = bar->control | cpu_to_le16(1);
+       memcpy(ctx->ra, bar->ra, 6);
+       memcpy(ctx->ta, bar->ta, 6);
+       ctx->control = bar->control;
        ctx->start_seq_num = bar->start_seq_num;
 }
 
@@ -688,12 +697,22 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc)
                switch (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) {
                case IEEE80211_STYPE_BACK_REQ:
                        handle_bar(desc, hdr, data_len, mac_err);
-                       /* fallthrough */
                        rx_filter |= CARL9170_RX_FILTER_CTL_BACKR;
                        break;
                case IEEE80211_STYPE_PSPOLL:
                        rx_filter |= CARL9170_RX_FILTER_CTL_PSPOLL;
                        break;
+               case IEEE80211_STYPE_BACK:
+                       if (fw.wlan.queued_bar) {
+                               /*
+                                * Don't filter block acks when the application
+                                * has queued BARs. This is because the firmware
+                                * can't do the accouting and the application
+                                * has to sort out if the BA belongs to any BARs.
+                                */
+                               break;
+                       }
+                       /* otherwise fall through */
                default:
                        rx_filter |= CARL9170_RX_FILTER_CTL_OTHER;
                        break;
@@ -728,7 +747,6 @@ static void handle_rx(void)
        }
 }
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 void wlan_cab_flush_queue(const unsigned int vif)
 {
        struct dma_queue *cab_queue = &fw.wlan.cab_queue[vif];
@@ -849,7 +867,6 @@ static void wlan_send_buffered_cab(void)
 
        }
 }
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 static void handle_beacon_config(void)
 {
@@ -862,9 +879,7 @@ static void handle_beacon_config(void)
 
 static void handle_pretbtt(void)
 {
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
        fw.wlan.cab_flush_time = get_clock_counter();
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
        rf_psm();
@@ -897,9 +912,7 @@ static void handle_radar(void)
 
 static void wlan_janitor(void)
 {
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
        wlan_send_buffered_cab();
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
        wlan_send_buffered_tx_status();