X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=cd169ff5cac4361270ca1c1f0c30a295e2998c09;hp=1f4afa3b618d147a7a7b9b493f85a86b5ae60a4c;hb=bc1a720197add99d877e4099a4ad272aec88b74f;hpb=fa097d02ca1683946b2207c8ebf69538e8c3cb9c

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 1f4afa3..cd169ff 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -44,32 +44,6 @@ static void wlan_txupdate(unsigned int queue)
 	wlan_trigger(BIT(queue));
 }
 
-static void wlan_dma_bump(unsigned int qidx)
-{
-	unsigned int offset = qidx;
-	uint32_t status, trigger;
-
-	status = get(AR9170_MAC_REG_DMA_STATUS) >> 12;
-	trigger = get(AR9170_MAC_REG_DMA_TRIGGER) >> 12;
-
-	while (offset != 0) {
-		status >>= 4;
-		trigger >>= 4;
-		offset--;
-	}
-
-	status &= 0xf;
-	trigger &= 0xf;
-
-	if ((trigger == 0xa) && (status == 0x8)) {
-		DBG("UNSTUCK");
-		wlan_txunstuck(qidx);
-	} else {
-		DBG("UPDATE");
-		wlan_txupdate(qidx);
-	}
-}
-
 #ifdef CONFIG_CARL9170FW_DEBUG
 static void wlan_dump_queue(unsigned int qidx)
 {
@@ -198,6 +172,7 @@ static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super)
 
 		/* update MAC flags */
 		super->f.hdr.mac.erp_prot = super->s.ri[super->s.rix].erp_prot;
+		super->f.hdr.mac.ampdu = super->s.ri[super->s.rix].ampdu;
 
 		/* reinitialize try counter */
 		super->s.cnt = 1;
@@ -290,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);
 
@@ -367,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;
@@ -382,7 +357,7 @@ static bool wlan_tx_status(struct dma_queue *queue,
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 	if (unlikely(super->s.cab))
-		fw.wlan.cab_queue_len--;
+		fw.wlan.cab_queue_len[super->s.vif_id]--;
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 	/* recycle freed descriptors */
@@ -432,8 +407,8 @@ void __hot wlan_tx(struct dma_desc *desc)
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 	if (unlikely(super->s.cab)) {
-		fw.wlan.cab_queue_len++;
-		dma_put(&fw.wlan.cab_queue, desc);
+		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 */
@@ -590,6 +565,8 @@ static void wlan_check_rx_overrun(void)
 			DBG("RX Overrun");
 			fw.wlan.mac_reset++;
 		}
+
+		wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
 	}
 }
 
@@ -597,8 +574,6 @@ static void handle_rx(void)
 {
 	struct dma_desc *desc;
 
-	wlan_check_rx_overrun();
-
 	for_each_desc_not_bits(desc, &fw.wlan.rx_queue, AR9170_OWN_BITS_HW) {
 		if (unlikely(desc->totalLen < 26 ||
 		    desc->totalLen > CONFIG_CARL9170FW_RX_FRAME_LEN)) {
@@ -620,6 +595,36 @@ 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];
+	struct dma_desc *desc;
+
+	/* move queued frames into the main tx queues */
+	for_each_desc(desc, cab_queue) {
+		struct carl9170_tx_superframe *super = get_super(desc);
+		if (!queue_empty(cab_queue)) {
+			/*
+			 * Set MOREDATA flag for all,
+			 * but the last queued frame.
+			 * see: 802.11-2007 11.2.1.5 f)
+			 *
+			 * This is actually the reason to why
+			 * we need to prevent the reentry.
+			 */
+
+			super->f.data.i3e.frame_control |=
+				cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+		} else {
+			super->f.data.i3e.frame_control &=
+				cpu_to_le16(~IEEE80211_FCTL_MOREDATA);
+		}
+
+		/* ready to roll! */
+		_wlan_tx(desc);
+	}
+}
+
 static uint8_t *beacon_find_ie(uint8_t ie)
 {
 	struct ieee80211_mgmt *mgmt = getp(AR9170_MAC_REG_BCN_ADDR);
@@ -646,60 +651,7 @@ static uint8_t *beacon_find_ie(uint8_t ie)
 	return NULL;
 }
 
-static void wlan_cab_flush_queue(void)
-{
-	struct dma_desc *desc;
-	uint8_t *_ie;
-	struct ieee80211_tim_ie *ie;
-
-	/*
-	 * 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.
-	 */
-	if (unlikely(fw.wlan.cab_flush_trigger == CARL9170_CAB_TRIGGER_DEFER))
-		return ;
-
-	_ie = beacon_find_ie(WLAN_EID_TIM);
-	if (unlikely(!_ie))
-		return ;
-
-	ie = (struct ieee80211_tim_ie *) &_ie[2];
-
-	/* Ideally, check here for == AR9170_CAB_TRIGGER_ARMED */
-	if (fw.wlan.cab_flush_trigger) {
-		/* move queued frames into the main tx queues */
-		for_each_desc(desc, &fw.wlan.cab_queue) {
-			struct carl9170_tx_superframe *super = get_super(desc);
-
-			if (!queue_empty(&fw.wlan.cab_queue)) {
-				/*
-				 * Set MOREDATA flag for all,
-				 * but the last queued frame.
-				 * see: 802.11-2007 11.2.1.5 f)
-				 *
-				 * This is actually the reason to why
-				 * we need to prevent the reentry.
-				 */
-
-				super->f.data.i3e.frame_control |=
-					cpu_to_le16(IEEE80211_FCTL_MOREDATA);
-			} else {
-				super->f.data.i3e.frame_control &=
-					cpu_to_le16(~IEEE80211_FCTL_MOREDATA);
-			}
-
-			/* ready to roll! */
-			_wlan_tx(desc);
-		}
-	}
-
-	/* Transfer finished - waiting for tx status */
-	fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_DEFER;
-}
-
-static void wlan_cab_modify_dtim_beacon(void)
+void wlan_cab_modify_dtim_beacon(const unsigned int vif)
 {
 	uint8_t *_ie;
 	struct ieee80211_tim_ie *ie;
@@ -707,16 +659,18 @@ static void wlan_cab_modify_dtim_beacon(void)
 	_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) && (ie->dtim_count == 0)) {
+		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 == 0) && (fw.wlan.cab_flush_trigger)) {
+		} else if ((fw.wlan.cab_queue_len[vif] == 0) && (fw.wlan.cab_flush_trigger)) {
 			/* undo all chances to the beacon structure */
 			ie->bitmap_ctrl &= ~0x1;
 			fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_EMPTY;
 		}
 
+		/* Triggered by CARL9170_CAB_TRIGGER_ARMED || CARL9170_CAB_TRIGGER_DEFER */
 		if (fw.wlan.cab_flush_trigger) {
 			/* Set the almighty Multicast Traffic Indication Bit. */
 			ie->bitmap_ctrl |= 0x1;
@@ -729,16 +683,6 @@ static void handle_beacon_config(void)
 {
 	uint32_t bcn_count;
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
-	/*
-	 * The application has now updated the relevant beacon data.
-	 * Now it should be the perfect time to apply the DTIM
-	 * multicast information.
-	 */
-
-	wlan_cab_modify_dtim_beacon();
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
-
 	bcn_count = get(AR9170_MAC_REG_BCN_COUNT);
 	send_cmd_to_host(4, CARL9170_RSP_BEACON_CONFIG, 0x00,
 			 (uint8_t *) &bcn_count);
@@ -758,7 +702,6 @@ static void handle_pretbtt(void)
 #else
 	send_cmd_to_host(0, CARL9170_RSP_PRETBTT, 0x00, NULL);
 #endif /* CONFIG_CARL9170FW_PSM */
-
 }
 
 static void handle_atim(void)
@@ -785,7 +728,7 @@ static void handle_radar(void)
 static void wlan_janitor(void)
 {
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-	if (unlikely(fw.wlan.cab_flush_trigger)) {
+	if (unlikely(fw.wlan.cab_flush_trigger == CARL9170_CAB_TRIGGER_ARMED)) {
 		/*
 		 * This is hardcoded into carl9170usb driver.
 		 *
@@ -796,9 +739,16 @@ static void wlan_janitor(void)
 		 * 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();
+		if (is_after_msecs(fw.wlan.cab_flush_time, (CARL9170_TBTT_DELTA))) {
+			wlan_cab_flush_queue(fw.wlan.cab_flush_vif);
+
+			/*
+			 * 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 = CARL9170_CAB_TRIGGER_DEFER;
 		}
 	}
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
@@ -857,6 +807,32 @@ void handle_wlan(void)
 #undef HANDLER
 }
 
+static void wlan_dma_bump(unsigned int qidx)
+{
+	unsigned int offset = qidx;
+	uint32_t status, trigger;
+
+	status = get(AR9170_MAC_REG_DMA_STATUS) >> 12;
+	trigger = get(AR9170_MAC_REG_DMA_TRIGGER) >> 12;
+
+	while (offset != 0) {
+		status >>= 4;
+		trigger >>= 4;
+		offset--;
+	}
+
+	status &= 0xf;
+	trigger &= 0xf;
+
+	if ((trigger == 0xa) && (status == 0x8)) {
+		DBG("UNSTUCK");
+		wlan_txunstuck(qidx);
+	} else {
+		DBG("UPDATE");
+		wlan_txupdate(qidx);
+	}
+}
+
 static void wlan_check_hang(void)
 {
 	struct dma_desc *desc;
@@ -916,6 +892,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.
@@ -938,7 +915,7 @@ static void wlan_mac_reset(void)
 	uint32_t rx_BB;
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 
-	ERR("MAC RESET");
+	INFO("MAC RESET");
 
 	/* Save aggregation parameters */
 	agg_wait_counter = get(AR9170_MAC_REG_AMPDU_FACTOR);
@@ -1018,6 +995,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)
 {