carl9170 firmware: general purpose desc for internal use

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

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 4e0feafa12615c96806ee5e52f2b73c79a0b369b..1909de1db86fe7819c22055107619245e9ee10bf 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -356,11 +356,9 @@ static void _wlan_tx(struct dma_desc *desc)
 static bool wlan_tx_status(struct dma_queue *queue,
                           struct dma_desc *desc)
 {
-       struct ar9170_tx_frame *frame = DESC_PAYLOAD(desc);
        struct carl9170_tx_superframe *super = get_super(desc);
-       struct ieee80211_hdr *hdr = &super->f.data.i3e;
        unsigned int qidx = super->s.queue;
-       bool txfail, success;
+       bool txfail = false, success;
 
        success = true;
 
@@ -381,7 +379,7 @@ static bool wlan_tx_status(struct dma_queue *queue,
                         * order.
                         */
 
-                       if (!frame->hdr.mac.ampdu) {
+                       if (!super->f.hdr.mac.ampdu) {
                                /*
                                 * 802.11 - 7.1.3.1.5.
                                 * set "Retry Field" for consecutive attempts
@@ -389,8 +387,8 @@ static bool wlan_tx_status(struct dma_queue *queue,
                                 * Note: For AMPDU see:
                                 * 802.11n 9.9.1.6 "Retransmit Procedures"
                                 */
-
-                               hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_RETRY);
+                               super->f.data.i3e.frame_control |=
+                                       cpu_to_le16(IEEE80211_FCTL_RETRY);
                        }
 
                        if (txfail) {
@@ -440,21 +438,22 @@ static bool wlan_tx_status(struct dma_queue *queue,
 
        unhide_super(desc);
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
-       if (unlikely(super == (void *) &dma_mem.reserved.ba)) {
-               fw.wlan.ba_desc = desc;
-               fw.wlan.ba_desc_available = 1;
+       if (unlikely(super == fw.wlan.fw_desc_data)) {
+               fw.wlan.fw_desc = desc;
+               fw.wlan.fw_desc_available = 1;
+               if (fw.wlan.fw_desc_callback)
+                       fw.wlan.fw_desc_callback(super, success);
+
                return true;
        }
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
-
-       wlan_tx_complete(super, success);
 
 #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);
+
        /* recycle freed descriptors */
        dma_reclaim(&fw.pta.down_queue, desc);
        down_trigger();
@@ -464,7 +463,6 @@ static bool wlan_tx_status(struct dma_queue *queue,
 static void handle_tx_completion(void)
 {
        struct dma_desc *desc;
-       unsigned int map = 0;
        int i;
 
        for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
@@ -480,10 +478,8 @@ static void handle_tx_completion(void)
 
                wlan_tx_ampdu_end(i);
                if (!queue_empty(&fw.wlan.tx_queue[i]))
-                       map |= BIT(i);
-
+                       wlan_trigger(BIT(i));
        }
-       wlan_trigger(map);
 }
 
 void __hot wlan_tx(struct dma_desc *desc)
@@ -507,7 +503,24 @@ void __hot wlan_tx(struct dma_desc *desc)
        wlan_trigger(BIT(super->s.queue));
 }
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
+static void wlan_tx_fw(struct carl9170_tx_superdesc *super)
+{
+       if (!fw.wlan.fw_desc_available)
+               return;
+
+       fw.wlan.fw_desc_available = 0;
+
+       /* Format BlockAck */
+       fw.wlan.fw_desc->status = AR9170_OWN_BITS_SW;
+       fw.wlan.fw_desc->ctrl = AR9170_CTRL_FS_BIT | AR9170_CTRL_LS_BIT;
+       fw.wlan.fw_desc->totalLen = fw.wlan.fw_desc->dataSize = super->len;
+       fw.wlan.fw_desc_data = fw.wlan.fw_desc->dataAddr = super;
+       fw.wlan.fw_desc->nextAddr = fw.wlan.fw_desc->lastAddr =
+               fw.wlan.fw_desc;
+
+       wlan_tx(fw.wlan.fw_desc);
+}
+
 static void wlan_send_buffered_ba(void)
 {
        struct carl9170_tx_ba_superframe *baf = &dma_mem.reserved.ba.ba;
@@ -518,26 +531,18 @@ static void wlan_send_buffered_ba(void)
                return;
 
        /* there's no point to continue when the ba_desc is not available. */
-       if (!fw.wlan.ba_desc_available)
+       if (!fw.wlan.fw_desc_available)
                return;
 
-       ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx % CONFIG_CARL9170FW_BACK_REQS_NUM];
+       ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx];
        fw.wlan.ba_head_idx++;
+       fw.wlan.ba_head_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM;
 
-       /* Format BlockAck */
-       fw.wlan.ba_desc->status = 0;
-       fw.wlan.ba_desc->ctrl = AR9170_CTRL_FS_BIT | AR9170_CTRL_LS_BIT;
-       fw.wlan.ba_desc_available = 0;
-       fw.wlan.ba_desc->nextAddr = fw.wlan.ba_desc->lastAddr =
-               fw.wlan.ba_desc;
-
-       baf->s.len = fw.wlan.ba_desc->totalLen = fw.wlan.ba_desc->dataSize =
-               sizeof(struct carl9170_tx_superdesc) +
-               sizeof(struct ar9170_tx_hwdesc) +
-               sizeof(struct ieee80211_ba);
-
-       baf->s.ri[0].tries = 3;
-       baf->s.queue = 0;
+       baf->s.len = sizeof(struct carl9170_tx_superdesc) +
+                    sizeof(struct ar9170_tx_hwdesc) +
+                    sizeof(struct ieee80211_ba);
+       baf->s.ri[0].tries = 1;
+       baf->s.queue = AR9170_TXQ_VO;
        baf->f.hdr.length = sizeof(struct ieee80211_ba) + FCS_LEN;
 
        /* HW Duration / Backoff */
@@ -567,20 +572,16 @@ static void wlan_send_buffered_ba(void)
         */
        ba->control = ctx->control | cpu_to_le16(1);
        ba->start_seq_num = ctx->start_seq_num;
-
-       wlan_tx(fw.wlan.ba_desc);
+       wlan_tx_fw(&baf->s);
 }
 
 static struct carl9170_bar_ctx *wlan_get_bar_cache_buffer(void)
 {
        struct carl9170_bar_ctx *tmp;
 
-       /* expire oldest entry, if we ran out of ba_ctx' */
-       if (fw.wlan.ba_head_idx + CONFIG_CARL9170FW_BACK_REQS_NUM < fw.wlan.ba_tail_idx)
-               fw.wlan.ba_head_idx++;
-
-       tmp = &fw.wlan.ba_cache[fw.wlan.ba_tail_idx % CONFIG_CARL9170FW_BACK_REQS_NUM];
+       tmp = &fw.wlan.ba_cache[fw.wlan.ba_tail_idx];
        fw.wlan.ba_tail_idx++;
+       fw.wlan.ba_tail_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM;
 
        return tmp;
 }
@@ -636,7 +637,6 @@ static void handle_bar(struct dma_desc *desc, struct ieee80211_hdr *hdr,
                ctx->phy = cpu_to_le32(0x2cc301);
        }
 }
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 
 static void wlan_check_rx_overrun(void)
 {
@@ -836,9 +836,7 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc)
        } else if (ieee80211_is_ctl(hdr->frame_control)) {
                switch (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) {
                case IEEE80211_STYPE_BACK_REQ:
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
                        handle_bar(desc, hdr, data_len, mac_err);
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
                        /* fallthrough */
                        rx_filter |= CARL9170_RX_FILTER_CTL_BACKR;
                        break;
@@ -1048,9 +1046,7 @@ static void wlan_janitor(void)
 
        wlan_send_buffered_tx_status();
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
        wlan_send_buffered_ba();
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 }
 
 void handle_wlan(void)