X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=cb4d9b00246edd5db1096302233c046ef6bf0b7c;hb=43fb7f27ef405582bc104cc8bf2ef451aa10b8b8;hp=ff074e3982ee3451c16ec73492e809e8c73b34ad;hpb=7cb1a2fccddb29f3479d92ab6532aa8dd728fb78;p=carl9170fw.git

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index ff074e3..cb4d9b0 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -156,8 +156,8 @@ static struct carl9170_tx_status *wlan_get_tx_status_buffer(void)
 }
 
 /* generate _aggregated_ tx_status for the host */
-static void wlan_tx_complete(struct carl9170_tx_superframe *super,
-			     bool txs)
+void wlan_tx_complete(struct carl9170_tx_superframe *super,
+		      bool txs)
 {
 	struct carl9170_tx_status *status;
 
@@ -169,6 +169,7 @@ static void wlan_tx_complete(struct carl9170_tx_superframe *super,
 	 */
 	status->cookie = super->s.cookie;
 	status->queue = super->s.queue;
+	super->s.cookie = 0;
 
 	/*
 	 * This field holds the number of tries of the rate in
@@ -355,16 +356,14 @@ 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;
 
 	success = true;
 
 	/* update hangcheck */
-	fw.wlan.last_tx_desc_num[qidx] = 0;
+	fw.wlan.last_super_num[qidx] = 0;
 
 	if (!!(desc->ctrl & AR9170_CTRL_FAIL)) {
 		txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL);
@@ -380,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
@@ -388,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) {
@@ -463,7 +462,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--) {
@@ -479,10 +477,9 @@ 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)
@@ -1095,6 +1092,12 @@ void handle_wlan(void)
 #undef HANDLER
 }
 
+enum {
+	CARL9170FW_TX_MAC_BUMP = 4,
+	CARL9170FW_TX_MAC_DEBUG = 6,
+	CARL9170FW_TX_MAC_RESET = 7,
+};
+
 static void wlan_check_hang(void)
 {
 	struct dma_desc *desc;
@@ -1110,10 +1113,10 @@ static void wlan_check_hang(void)
 		desc = get_wlan_txq_addr(i);
 
 		/* Stuck frame detection */
-		if (unlikely(desc == fw.wlan.last_tx_desc[i])) {
-			fw.wlan.last_tx_desc_num[i]++;
+		if (unlikely(DESC_PAYLOAD(desc) == fw.wlan.last_super[i])) {
+			fw.wlan.last_super_num[i]++;
 
-			if (unlikely(fw.wlan.last_tx_desc_num[i] > 6)) {
+			if (unlikely(fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_RESET)) {
 				/*
 				 * schedule MAC reset (aka OFF/ON => dead)
 				 *
@@ -1126,7 +1129,7 @@ static void wlan_check_hang(void)
 			}
 
 #ifdef CONFIG_CARL9170FW_DEBUG
-			if (unlikely(fw.wlan.last_tx_desc_num[i] > 5)) {
+			if (unlikely(fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_DEBUG)) {
 				/*
 				 * Sigh, the queue is almost certainly
 				 * dead. Dump the queue content to the
@@ -1139,7 +1142,7 @@ static void wlan_check_hang(void)
 #endif /* CONFIG_CARL9170FW_DEBUG */
 
 #ifdef CONFIG_CARL9170FW_DMA_QUEUE_BUMP
-			if (unlikely(fw.wlan.last_tx_desc_num[i] > 3)) {
+			if (unlikely(fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_BUMP)) {
 				/*
 				 * Hrrm, bump the queue a bit.
 				 * maybe this will get it going again.
@@ -1151,8 +1154,8 @@ static void wlan_check_hang(void)
 #endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
 		} else {
 			/* Nothing stuck */
-			fw.wlan.last_tx_desc[i] = desc;
-			fw.wlan.last_tx_desc_num[i] = 0;
+			fw.wlan.last_super[i] = DESC_PAYLOAD(desc);
+			fw.wlan.last_super_num[i] = 0;
 		}
 	}
 }
@@ -1258,6 +1261,29 @@ static void wlan_mac_reset(void)
 
 		__for_each_desc_bits(iter, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW);
 
+		/* kill the stuck frame */
+		if (!is_terminator(&fw.wlan.tx_queue[i], iter) &&
+		    fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_RESET &&
+		    fw.wlan.last_super[i] == DESC_PAYLOAD(iter)) {
+			struct carl9170_tx_superframe *super = get_super(iter);
+
+			iter->status = AR9170_OWN_BITS_SW;
+			/*
+			 * Mark the frame as failed.
+			 * The BAFAIL flag allows the frame to sail through
+			 * wlan_tx_status without much "unstuck" trouble.
+			 */
+			iter->ctrl &= ~(AR9170_CTRL_FAIL);
+			iter->ctrl |= AR9170_CTRL_BAFAIL;
+
+			super->s.cnt = CARL9170_TX_MAX_RATE_TRIES;
+			super->s.rix = CARL9170_TX_MAX_RETRY_RATES;
+
+			fw.wlan.last_super_num[i] = 0;
+			fw.wlan.last_super[i] = NULL;
+			iter = iter->lastAddr->nextAddr;
+		}
+
 		set_wlan_txq_dma_addr(i, (uint32_t) iter);
 		if (!is_terminator(&fw.wlan.tx_queue[i], iter))
 			val |= BIT(i);