X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=36d4b86bf776ed898bb401ea54b64c84f114b398;hp=de13dbf317e57495428881e4d53196674e2b7e31;hb=1cdca4d5817d287c36611e6120042a6057df7e0e;hpb=93192408781150af7e10a1d0970b9497940579dc

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index de13dbf..36d4b86 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -38,12 +38,40 @@ static void wlan_txunstuck(unsigned int queue)
 	wlan_trigger(BIT(queue));
 }
 
+#ifdef CONFIG_CARL9170FW_DMA_QUEUE_BUMP
 static void wlan_txupdate(unsigned int queue)
 {
 	set_wlan_txq_dma_addr(queue, ((uint32_t) fw.wlan.tx_queue[queue].head));
 	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);
+	}
+}
+#endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
+
 #ifdef CONFIG_CARL9170FW_DEBUG
 static void wlan_dump_queue(unsigned int qidx)
 {
@@ -398,13 +426,6 @@ void __hot wlan_tx(struct dma_desc *desc)
 	super->s.cnt = 1;
 	hide_super(desc);
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
-	if (!queue_empty(&fw.wlan.tx_queue[super->s.queue])) {
-		dma_put(&fw.wlan.tx_delay[super->s.queue], desc);
-		return;
-	}
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
-
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 	if (unlikely(super->s.cab)) {
 		fw.wlan.cab_queue_len[super->s.vif_id]++;
@@ -413,6 +434,13 @@ void __hot wlan_tx(struct dma_desc *desc)
 	}
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
+#ifdef CONFIG_CARL9170FW_DELAYED_TX
+	if (!queue_empty(&fw.wlan.tx_queue[super->s.queue])) {
+		dma_put(&fw.wlan.tx_delay[super->s.queue], desc);
+		return;
+	}
+#endif /* CONFIG_CARL9170FW_DELAYED_TX */
+
 	_wlan_tx(desc);
 }
 
@@ -494,19 +522,13 @@ static struct carl9170_bar_ctx *wlan_get_bar_cache_buffer(void)
 	return tmp;
 }
 
-static void handle_bar(struct dma_desc *desc)
+static void handle_bar(struct dma_desc *desc, struct ieee80211_hdr *hdr,
+		       unsigned int len, unsigned int mac_err)
 {
-	struct ieee80211_hdr *hdr;
 	struct ieee80211_bar *bar;
 	struct carl9170_bar_ctx *ctx;
 
-	hdr = ar9170_get_rx_i3e(desc);
-
-	/* check if this is a BAR for us */
-	if (likely(!ieee80211_is_back_req(hdr->frame_control)))
-		return ;
-
-	if (unlikely(ar9170_get_rx_macstatus_error(desc))) {
+	if (unlikely(mac_err)) {
 		/*
 		 * This check does a number of things:
 		 * 1. checks if the frame is in good nick
@@ -515,8 +537,7 @@ static void handle_bar(struct dma_desc *desc)
 		return ;
 	}
 
-	if (unlikely(ar9170_get_rx_mpdu_len(desc) <
-	    sizeof(struct ieee80211_bar))) {
+	if (unlikely(len < (sizeof(struct ieee80211_bar) + FCS_LEN))) {
 		/*
 		 * Sneaky, corrupted BARs... but not with us!
 		 */
@@ -570,26 +591,76 @@ static void wlan_check_rx_overrun(void)
 	}
 }
 
-static void handle_rx(void)
+static unsigned int wlan_rx_filter(struct dma_desc *desc)
 {
-	struct dma_desc *desc;
+	struct ieee80211_hdr *hdr;
+	unsigned int data_len;
+	unsigned int rx_filter;
+	unsigned int mac_err;
 
-	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)) {
-			/*
-			 * This frame is too damaged to do anything
-			 * useful with it.
-			 */
-			dma_reclaim(&fw.wlan.rx_queue, desc);
-			_wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
-		} else {
+	data_len = ar9170_get_rx_mpdu_len(desc);
+	mac_err = ar9170_get_rx_macstatus_error(desc);
+
+#define AR9170_RX_ERROR_BAD (AR9170_RX_ERROR_FCS | AR9170_RX_ERROR_PLCP)
+
+	if (unlikely(data_len < (4 + 6 + FCS_LEN) ||
+	    desc->totalLen > CONFIG_CARL9170FW_RX_FRAME_LEN) ||
+	    mac_err & AR9170_RX_ERROR_BAD) {
+		/*
+		 * This frame is too damaged to do anything
+		 * useful with it.
+		 */
+
+		return CARL9170_RX_FILTER_BAD;
+	}
+
+	rx_filter = 0;
+	if (mac_err & AR9170_RX_ERROR_WRONG_RA)
+		rx_filter |= CARL9170_RX_FILTER_OTHER_RA;
+
+	if (mac_err & AR9170_RX_ERROR_DECRYPT)
+		rx_filter |= CARL9170_RX_FILTER_DECRY_FAIL;
+
+	hdr = ar9170_get_rx_i3e(desc);
+	if (likely(ieee80211_is_data(hdr->frame_control))) {
+		rx_filter |= CARL9170_RX_FILTER_DATA;
+	} 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);
+			handle_bar(desc, hdr, data_len, mac_err);
 #endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+			/* fallthrough */
+			rx_filter |= CARL9170_RX_FILTER_CTL_BACKR;
+			break;
+		case IEEE80211_STYPE_PSPOLL:
+			rx_filter |= CARL9170_RX_FILTER_CTL_PSPOLL;
+			break;
+		default:
+			rx_filter |= CARL9170_RX_FILTER_CTL_OTHER;
+			break;
+		}
+	} else {
+		/* ieee80211_is_mgmt */
+		rx_filter |= CARL9170_RX_FILTER_MGMT;
+	}
+
+#undef AR9170_RX_ERROR_BAD
+
+	return rx_filter;
+}
+
+static void handle_rx(void)
+{
+	struct dma_desc *desc;
 
+	for_each_desc_not_bits(desc, &fw.wlan.rx_queue, AR9170_OWN_BITS_HW) {
+		if (!(wlan_rx_filter(desc) & fw.wlan.rx_filter)) {
 			dma_put(&fw.pta.up_queue, desc);
 			up_trigger();
+		} else {
+			dma_reclaim(&fw.wlan.rx_queue, desc);
+			_wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
 		}
 	}
 }
@@ -625,16 +696,11 @@ void wlan_cab_flush_queue(const unsigned int vif)
 	}
 }
 
-static uint8_t *beacon_find_ie(uint8_t ie)
+static uint8_t *beacon_find_ie(uint8_t ie, void *addr,
+			       const unsigned int len)
 {
-	struct ieee80211_mgmt *mgmt = getp(AR9170_MAC_REG_BCN_ADDR);
+	struct ieee80211_mgmt *mgmt = addr;
 	uint8_t *pos, *end;
-	unsigned int len;
-
-	len = get(AR9170_MAC_REG_BCN_LENGTH);
-
-	if (len < FCS_LEN + sizeof(mgmt))
-		return NULL;
 
 	pos = mgmt->u.beacon.variable;
 	end = (uint8_t *) ((unsigned long)mgmt + (len - FCS_LEN));
@@ -651,12 +717,13 @@ static uint8_t *beacon_find_ie(uint8_t ie)
 	return NULL;
 }
 
-void wlan_cab_modify_dtim_beacon(const unsigned int vif)
+void wlan_cab_modify_dtim_beacon(const unsigned int vif,
+	const unsigned int addr, const unsigned int len)
 {
 	uint8_t *_ie;
 	struct ieee80211_tim_ie *ie;
 
-	_ie = beacon_find_ie(WLAN_EID_TIM);
+	_ie = beacon_find_ie(WLAN_EID_TIM, (void *)addr, len);
 	if (likely(_ie)) {
 		ie = (struct ieee80211_tim_ie *) &_ie[2];
 
@@ -669,7 +736,7 @@ void wlan_cab_modify_dtim_beacon(const unsigned int vif)
 			fw.wlan.cab_flush_trigger[vif] = CARL9170_CAB_TRIGGER_EMPTY;
 		}
 
-		/* Triggered by CARL9170_CAB_TRIGGER_ARMED || CARL9170_CAB_TRIGGER_READY || CARL9170_CAB_TRIGGER_DEFER */
+		/* Triggered by CARL9170_CAB_TRIGGER_ARMED || CARL9170_CAB_TRIGGER_DEFER */
 		if (fw.wlan.cab_flush_trigger[vif]) {
 			/* Set the almighty Multicast Traffic Indication Bit. */
 			ie->bitmap_ctrl |= 0x1;
@@ -685,26 +752,13 @@ static void handle_beacon_config(void)
 	bcn_count = get(AR9170_MAC_REG_BCN_COUNT);
 	send_cmd_to_host(4, CARL9170_RSP_BEACON_CONFIG, 0x00,
 			 (uint8_t *) &bcn_count);
+
+	set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY);
 }
 
 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 */
 
@@ -745,7 +799,7 @@ static void wlan_janitor(void)
 	unsigned int i;
 
 	for (i = 0; i < CARL9170_INTF_NUM; i++) {
-		if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_READY)) {
+		if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_ARMED)) {
 			/*
 			 * This is hardcoded into carl9170usb driver.
 			 *
@@ -801,6 +855,9 @@ void handle_wlan(void)
 		}					\
 	} while (0)
 
+	intr |= fw.wlan.soft_int;
+	fw.wlan.soft_int = 0;
+
 	HANDLER(intr, AR9170_MAC_INT_PRETBTT, handle_pretbtt);
 
 	HANDLER(intr, AR9170_MAC_INT_ATIM, handle_atim);
@@ -826,32 +883,6 @@ 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;
@@ -895,6 +926,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)) {
 				/*
 				 * Hrrm, bump the queue a bit.
@@ -903,6 +935,7 @@ static void wlan_check_hang(void)
 
 				wlan_dma_bump(i);
 			}
+#endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
 		} else {
 			/* Nothing stuck */
 			fw.wlan.last_tx_desc[i] = desc;
@@ -928,6 +961,7 @@ static void wlan_mac_reset(void)
 	uint32_t cam_mode;
 	uint32_t ack_power;
 	uint32_t rts_cts_tpc;
+	uint32_t rts_cts_rate;
 	unsigned int i;
 
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
@@ -948,6 +982,7 @@ static void wlan_mac_reset(void)
 
 	ack_power = get(AR9170_MAC_REG_ACK_TPC);
 	rts_cts_tpc = get(AR9170_MAC_REG_RTS_CTS_TPC);
+	rts_cts_rate = get(AR9170_MAC_REG_RTS_CTS_RATE);
 
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 	/* 0x1c8960 write only */
@@ -989,6 +1024,7 @@ static void wlan_mac_reset(void)
 
 	set(AR9170_MAC_REG_RTS_CTS_TPC, rts_cts_tpc);
 	set(AR9170_MAC_REG_ACK_TPC, ack_power);
+	set(AR9170_MAC_REG_RTS_CTS_RATE, rts_cts_rate);
 
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 	set(AR9170_PHY_REG_SWITCH_CHAIN_2, rx_BB);
@@ -1000,17 +1036,24 @@ static void wlan_mac_reset(void)
 	 * set(AR9170_PHY_REG_CCA_THRESHOLD, 0x0);
 	 */
 
+	/* Reinitialize all WLAN TX DMA queues. */
 	for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
-		DBG("Q:%d l:%d h:%p t:%p\n", i, queue_len(&fw.wlan.tx_queue[i]),
-		     fw.wlan.tx_queue[i].head, fw.wlan.tx_queue[i].terminator);
+		struct dma_desc *iter;
 
-		set_wlan_txq_dma_addr(i, (uint32_t) fw.wlan.tx_queue[i].head);
+		__for_each_desc_bits(iter, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW);
 
-		if (!queue_empty(&fw.wlan.tx_queue[i]))
+		set_wlan_txq_dma_addr(i, (uint32_t) iter);
+		if (!is_terminator(&fw.wlan.tx_queue[i], iter))
 			wlan_trigger(BIT(i));
+
+		DBG("Q:%d l:%d h:%p t:%p cu:%p it:%p ct:%x st:%x\n", i, queue_len(&fw.wlan.tx_queue[i]),
+		     fw.wlan.tx_queue[i].head, fw.wlan.tx_queue[i].terminator,
+		     get_wlan_txq_addr(i), iter, iter->ctrl, iter->status);
 	}
 
-	handle_rx();
+	fw.wlan.soft_int |= AR9170_MAC_INT_RXC | AR9170_MAC_INT_TXC |
+			    AR9170_MAC_INT_RETRY_FAIL;
+
 	set(AR9170_MAC_REG_DMA_RXQ_ADDR, (uint32_t) fw.wlan.rx_queue.head);
 	wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
 }