X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=94ed62250d806ed262cdc86c316d2df4370fa35c;hb=a9df280e9edf83ab1596a81c1bf47cd2e72f3d50;hp=69d90e628d97062ac968aaadc025e8d4617ed3d8;hpb=5afdefe0d025f110bb270d8a2ad4e1773fbd70b9;p=carl9170fw.git

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 69d90e6..94ed622 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -292,25 +292,12 @@ static void __wlan_tx(struct dma_desc *desc)
 
 	wlan_tx_ampdu(super);
 
-#if (defined CONFIG_CARL9170FW_LOOPBACK) || (defined CONFIG_CARL9170FW_DISCARD)
-	wlan_tx_complete(super, true);
-	unhide_super(desc);
-# ifdef CONFIG_CARL9170FW_LOOPBACK
-	dma_put(&fw.pta.up_queue, desc);
-	up_trigger();
-# elif CONFIG_CARL9170FW_DISCARD
-	dma_reclaim(&fw.pta.down_queue, desc);
-	down_trigger();
-# endif
-#else /* CONFIG_CARL9170FW_LOOPBACK */
-
-# ifdef CONFIG_CARL9170FW_DEBUG
+#ifdef CONFIG_CARL9170FW_DEBUG
 	BUG_ON(fw.phy.psm.state != CARL9170_PSM_WAKE);
-# endif /* CONFIG_CARL9170FW_DEBUG */
+#endif /* CONFIG_CARL9170FW_DEBUG */
 
 	/* insert desc into the right queue */
 	dma_put(&fw.wlan.tx_queue[super->s.queue], desc);
-#endif /* CONFIG_CARL9170FW_LOOPBACK */
 }
 
 static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif)
@@ -318,7 +305,7 @@ static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif)
 	hdr->seq_ctrl &= cpu_to_le16(~IEEE80211_SCTL_SEQ);
 	hdr->seq_ctrl |= cpu_to_le16(fw.wlan.sequence[vif]);
 
-	if (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG)))
+	if (ieee80211_is_first_frag(hdr->seq_ctrl))
 		fw.wlan.sequence[vif] += 0x10;
 }
 
@@ -343,8 +330,6 @@ static void _wlan_tx(struct dma_desc *desc)
 			    get(AR9170_MAC_REG_AMPDU_FACTOR),
 			    8 << super->s.ampdu_factor));
 	}
-
-	__wlan_tx(desc);
 }
 
 /* propagate transmission status back to the driver */
@@ -366,6 +351,12 @@ static bool wlan_tx_status(struct dma_queue *queue,
 		/* reset retry indicator flags */
 		desc->ctrl &= ~(AR9170_CTRL_TXFAIL | AR9170_CTRL_BAFAIL);
 
+		/*
+		 * Note: wlan_tx_consume_retry will override the old
+		 * phy [CCK,OFDM, HT, BW20/40, MCS...] and mac vectors
+		 * [AMPDU,RTS/CTS,...] therefore be careful when they
+		 * are used.
+		 */
 		if (wlan_tx_consume_retry(super)) {
 			/*
 			 * retry for simple and aggregated 802.11 frames.
@@ -410,7 +401,11 @@ static bool wlan_tx_status(struct dma_queue *queue,
 				 * be aware of this so the frames don't get lost.
 				 */
 
+#ifndef CONFIG_CARL9170FW_DEBUG
 				dma_unlink_head(queue);
+#else /* CONFIG_CARL9170FW_DEBUG */
+				BUG_ON(dma_unlink_head(queue) != desc);
+#endif /* CONFIG_CARL9170FW_DEBUG */
 				dma_put(&fw.wlan.tx_retry, desc);
 				return true;
 			}
@@ -420,7 +415,11 @@ static bool wlan_tx_status(struct dma_queue *queue,
 		}
 	}
 
+#ifndef CONFIG_CARL9170FW_DEBUG
 	dma_unlink_head(queue);
+#else /* CONFIG_CARL9170FW_DEBUG */
+	BUG_ON(dma_unlink_head(queue) != desc);
+#endif /* CONFIG_CARL9170FW_DEBUG */
 	if (txfail) {
 		/*
 		 * Issue the queue bump,
@@ -469,7 +468,6 @@ static void handle_tx_completion(void)
 			}
 		}
 
-
 		wlan_tx_ampdu_reset(i);
 
 		for_each_desc(desc, &fw.wlan.tx_retry)
@@ -499,6 +497,7 @@ void __hot wlan_tx(struct dma_desc *desc)
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 	_wlan_tx(desc);
+	__wlan_tx(desc);
 	wlan_trigger(BIT(super->s.queue));
 }
 
@@ -527,7 +526,7 @@ static void wlan_send_buffered_ba(void)
 	struct ieee80211_ba *ba = (struct ieee80211_ba *) &baf->f.ba;
 	struct carl9170_bar_ctx *ctx;
 
-	if (likely(fw.wlan.ba_head_idx == fw.wlan.ba_tail_idx))
+	if (likely(!fw.wlan.queued_ba))
 		return;
 
 	/* there's no point to continue when the ba_desc is not available. */
@@ -537,6 +536,7 @@ static void wlan_send_buffered_ba(void)
 	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;
+	fw.wlan.queued_ba--;
 
 	baf->s.len = sizeof(struct carl9170_tx_superdesc) +
 		     sizeof(struct ar9170_tx_hwdesc) +
@@ -583,6 +583,8 @@ static struct carl9170_bar_ctx *wlan_get_bar_cache_buffer(void)
 	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;
+	if (fw.wlan.queued_ba < CONFIG_CARL9170FW_BACK_REQS_NUM)
+		fw.wlan.queued_ba++;
 
 	return tmp;
 }
@@ -707,12 +709,10 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc)
 		rx_filter |= CARL9170_RX_FILTER_MGMT;
 	}
 
-#ifdef CONFIG_CARL9170FW_WOL
 	if (unlikely(fw.suspend_mode == CARL9170_HOST_SUSPENDED)) {
 		wol_rx(rx_filter, hdr, min(data_len,
 			(unsigned int)AR9170_BLOCK_SIZE));
 	}
-#endif /* CONFIG_CARL9170FW_WOL */
 
 #undef AR9170_RX_ERROR_BAD
 
@@ -762,6 +762,7 @@ void wlan_cab_flush_queue(const unsigned int vif)
 
 		/* ready to roll! */
 		_wlan_tx(desc);
+		__wlan_tx(desc);
 		wlan_trigger(BIT(super->s.queue));
 	}
 }