carl9170 firmware: revamp Content After Beacon handling

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

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 367dfabe0cfbd19ebd353c437a20ac76ee65efb2..de13dbf317e57495428881e4d53196674e2b7e31 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -265,6 +265,9 @@ static bool wlan_tx_status(struct dma_queue *queue,
 
        success = true;
 
+       /* update hangcheck */
+       fw.wlan.last_tx_desc_num[qidx] = 0;
+
        if (!!(desc->ctrl & AR9170_CTRL_FAIL)) {
                txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL);
 
@@ -342,9 +345,6 @@ static bool wlan_tx_status(struct dma_queue *queue,
 
        unhide_super(desc);
 
-       /* update hangcheck */
-       fw.wlan.last_tx_desc_num[qidx] = 0;
-
 #ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
        if (unlikely(super == (void *) &dma_mem.reserved.ba)) {
                fw.wlan.ba_desc = desc;
@@ -562,14 +562,11 @@ static void wlan_check_rx_overrun(void)
        fw.wlan.rx_overruns += overruns = get(AR9170_MAC_REG_RX_OVERRUN);
        if (unlikely(overruns)) {
                if (overruns == total) {
-                       /*
-                        * Theoretically, it should be enough to
-                        * trigger the WLAN RX DMA bit. But the
-                        * original firmware wanted a reset...
-                        */
                        DBG("RX Overrun");
                        fw.wlan.mac_reset++;
                }
+
+               wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
        }
 }
 
@@ -662,19 +659,18 @@ void wlan_cab_modify_dtim_beacon(const unsigned int vif)
        _ie = beacon_find_ie(WLAN_EID_TIM);
        if (likely(_ie)) {
                ie = (struct ieee80211_tim_ie *) &_ie[2];
-               fw.wlan.cab_flush_vif = vif;
 
                if (!queue_empty(&fw.wlan.cab_queue[vif]) && (ie->dtim_count == 0)) {
                        /* schedule DTIM transfer */
-                       fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_ARMED;
-               } else if ((fw.wlan.cab_queue_len[vif] == 0) && (fw.wlan.cab_flush_trigger)) {
+                       fw.wlan.cab_flush_trigger[vif] = CARL9170_CAB_TRIGGER_ARMED;
+               } else if ((fw.wlan.cab_queue_len[vif] == 0) && (fw.wlan.cab_flush_trigger[vif])) {
                        /* undo all chances to the beacon structure */
                        ie->bitmap_ctrl &= ~0x1;
-                       fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_EMPTY;
+                       fw.wlan.cab_flush_trigger[vif] = CARL9170_CAB_TRIGGER_EMPTY;
                }
 
-               /* Triggered by CARL9170_CAB_TRIGGER_ARMED || CARL9170_CAB_TRIGGER_DEFER */
-               if (fw.wlan.cab_flush_trigger) {
+               /* Triggered by CARL9170_CAB_TRIGGER_ARMED || CARL9170_CAB_TRIGGER_READY || CARL9170_CAB_TRIGGER_DEFER */
+               if (fw.wlan.cab_flush_trigger[vif]) {
                        /* Set the almighty Multicast Traffic Indication Bit. */
                        ie->bitmap_ctrl |= 0x1;
                }
@@ -694,6 +690,21 @@ static void handle_beacon_config(void)
 static void handle_pretbtt(void)
 {
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
+#if CARL9170_INTF_NUM != 2
+       /* GCC BUG ? */
+       unsigned int i;
+
+       for (i = 0; i < CARL9170_INTF_NUM; i++) {
+               if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_ARMED))
+                       fw.wlan.cab_flush_trigger[i] = CARL9170_CAB_TRIGGER_READY;
+       }
+#else
+       if (unlikely(fw.wlan.cab_flush_trigger[0] == CARL9170_CAB_TRIGGER_ARMED))
+               fw.wlan.cab_flush_trigger[0] = CARL9170_CAB_TRIGGER_READY;
+       if (unlikely(fw.wlan.cab_flush_trigger[1] == CARL9170_CAB_TRIGGER_ARMED))
+               fw.wlan.cab_flush_trigger[1] = CARL9170_CAB_TRIGGER_READY;
+#endif
+
        fw.wlan.cab_flush_time = get_clock_counter();
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
@@ -731,28 +742,33 @@ static void handle_radar(void)
 static void wlan_janitor(void)
 {
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-       if (unlikely(fw.wlan.cab_flush_trigger == CARL9170_CAB_TRIGGER_ARMED)) {
-               /*
-                * This is hardcoded into carl9170usb driver.
-                *
-                * The driver must set the PRETBTT event to beacon_interval -
-                * CARL9170_PRETBTT_KUS (usually 6) Kus.
-                *
-                * But still, we can only do so much about 802.11-2007 9.3.2.1 &
-                * 11.2.1.6. Let's hope the current solution is adequate enough.
-                */
-
-               if (is_after_msecs(fw.wlan.cab_flush_time, (CARL9170_TBTT_DELTA))) {
-                       wlan_cab_flush_queue(fw.wlan.cab_flush_vif);
+       unsigned int i;
 
+       for (i = 0; i < CARL9170_INTF_NUM; i++) {
+               if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_READY)) {
                        /*
-                        * This prevents the code from sending new BC/MC frames
-                        * which were queued after the previous buffered traffic
-                        * has been sent out... They will have to wait until the
-                        * next DTIM beacon comes along.
+                        * This is hardcoded into carl9170usb driver.
+                        *
+                        * The driver must set the PRETBTT event to beacon_interval -
+                        * CARL9170_PRETBTT_KUS (usually 6) Kus.
+                        *
+                        * But still, we can only do so much about 802.11-2007 9.3.2.1 &
+                        * 11.2.1.6. Let's hope the current solution is adequate enough.
                         */
-                       fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_DEFER;
+
+                       if (is_after_msecs(fw.wlan.cab_flush_time, (CARL9170_TBTT_DELTA))) {
+                               wlan_cab_flush_queue(i);
+
+                               /*
+                                * This prevents the code from sending new BC/MC frames
+                                * which were queued after the previous buffered traffic
+                                * has been sent out... They will have to wait until the
+                                * next DTIM beacon comes along.
+                                */
+                               fw.wlan.cab_flush_trigger[i] = CARL9170_CAB_TRIGGER_DEFER;
+                       }
                }
+
        }
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
@@ -895,6 +911,7 @@ static void wlan_check_hang(void)
        }
 }
 
+#ifdef CONFIG_CARL9170FW_FW_MAC_RESET
 /*
  * NB: Resetting the MAC is a two-edged sword.
  * On most occasions, it does what it is supposed to do.
@@ -997,6 +1014,13 @@ static void wlan_mac_reset(void)
        set(AR9170_MAC_REG_DMA_RXQ_ADDR, (uint32_t) fw.wlan.rx_queue.head);
        wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
 }
+#else
+static void wlan_mac_reset(void)
+{
+       /* The driver takes care of reinitializing the device */
+       BUG("MAC RESET");
+}
+#endif /* CONFIG_CARL9170FW_FW_MAC_RESET */
 
 void __cold wlan_timer(void)
 {