X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=9eb336a267eee7c4858d1e057e18358cede4b7c8;hb=6476369c2c6d4ba487408cb5daff8df0480d6b4a;hp=61976b05d6b3311ca96d905907f55eedbc52406e;hpb=c48e2d095d50c9aea409c3171ed1f183fe906ea6;p=carl9170fw.git

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 61976b0..9eb336a 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -31,18 +31,17 @@
 #include "printf.h"
 #include "rf.h"
 #include "linux/ieee80211.h"
+#include "rom.h"
 
 static void wlan_txunstuck(unsigned int queue)
 {
 	set_wlan_txq_dma_addr(queue, ((uint32_t) fw.wlan.tx_queue[queue].head) | 1);
-	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)
@@ -212,13 +211,48 @@ static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super)
 	return true;
 }
 
+static inline u16 get_tid(struct ieee80211_hdr *hdr)
+{
+        return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;
+}
+
+/* This function will only work on uint32_t-aligned pointers! */
+static inline bool compare_ether_address(const void *_d0, const void *_d1)
+{
+	const uint32_t *d0 = _d0;
+	const uint32_t *d1 = _d1;
+
+	/* BUG_ON((unsigned long)d0 & 3 || (unsigned long)d1 & 3)) */
+	return !((d0[0] ^ d1[0]) | (unsigned short)(d0[1] ^ d1[1]));
+}
+
+#ifdef CONFIG_CARL9170FW_TX_AMPDU
+static void wlan_tx_ampdu(struct carl9170_tx_superframe *super)
+{
+	unsigned int qidx = super->s.queue;
+	struct carl9170_tx_superframe *ht_prev = fw.wlan.ampdu_prev[qidx];
+
+	if (!super->f.hdr.mac.ampdu) {
+		fw.wlan.ampdu_prev[qidx] = NULL;
+
+		if (ht_prev)
+			ht_prev->f.hdr.mac.ba_end = 1;
+	} else {
+		fw.wlan.ampdu_prev[qidx] = super;
+
+		if (ht_prev && (get_tid(&super->f.data.i3e) != get_tid(&ht_prev->f.data.i3e) ||
+		    !compare_ether_address(super->f.data.i3e.addr1, ht_prev->f.data.i3e.addr1)))
+			ht_prev->f.hdr.mac.ba_end = 1;
+		else
+			super->f.hdr.mac.ba_end = 0;
+	}
+}
+#endif /* CONFIG_CARL9170FW_TX_AMPDU */
+
 /* for all tries */
 static void __wlan_tx(struct dma_desc *desc)
 {
 	struct carl9170_tx_superframe *super = get_super(desc);
-#ifdef CONFIG_CARL9170FW_NORMAL_TX_RX
-	unsigned int queue = super->s.queue;
-#endif /* CONFIG_CARL9170FW_LOOPBACK */
 
 	if (unlikely(super->s.fill_in_tsf)) {
 		struct ieee80211_mgmt *mgmt = (void *) &super->f.data.i3e;
@@ -237,6 +271,10 @@ static void __wlan_tx(struct dma_desc *desc)
 		read_tsf(tsf);
 	}
 
+#ifdef CONFIG_CARL9170FW_TX_AMPDU
+	wlan_tx_ampdu(super);
+#endif /* CONFIG_CARL9170FW_TX_AMPDU */
+
 #if (defined CONFIG_CARL9170FW_LOOPBACK) || (defined CONFIG_CARL9170FW_DISCARD)
 	wlan_tx_complete(super, true);
 	unhide_super(desc);
@@ -254,8 +292,7 @@ static void __wlan_tx(struct dma_desc *desc)
 # endif /* CONFIG_CARL9170FW_DEBUG && CONFIG_CARL9170FW_PSM */
 
 	/* insert desc into the right queue */
-	dma_put(&fw.wlan.tx_queue[queue], desc);
-	wlan_trigger(BIT(queue));
+	dma_put(&fw.wlan.tx_queue[super->s.queue], desc);
 #endif /* CONFIG_CARL9170FW_LOOPBACK */
 }
 
@@ -414,6 +451,7 @@ static void handle_tx_completion(void)
 		for_each_desc(desc, &fw.wlan.tx_delay[i])
 			_wlan_tx(desc);
 #endif /* CONFIG_CARL9170FW_DELAYED_TX */
+		wlan_trigger(BIT(i));
 	}
 }
 
@@ -426,13 +464,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]++;
@@ -441,7 +472,15 @@ 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);
+	wlan_trigger(BIT(super->s.queue));
 }
 
 #ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
@@ -591,6 +630,83 @@ static void wlan_check_rx_overrun(void)
 	}
 }
 
+#ifdef CONFIG_CARL9170FW_WOL
+static void wlan_rx_wol(struct ieee80211_hdr *hdr, unsigned int len)
+{
+	const unsigned char *data, *end, *mac;
+	unsigned int found = 0;
+
+	/*
+	 * LIMITATION:
+	 * We can only scan the first AR9170_BLOCK_SIZE [=~320] bytes
+	 * for MAGIC patterns!
+	 */
+
+	/*
+	 * TODO:
+	 * Currently, the MAGIC MAC Address is fixed to the EEPROM default.
+	 * It's possible to make it fully configurable, e.g:
+	 *
+	 * mac = (const unsigned char *) AR9170_MAC_REG_MAC_ADDR_L;
+	 * But this will clash with the driver's suspend path, because it
+	 * needs to reset the registers.
+	 */
+	mac = rom.sys.mac_address;
+
+	data = (u8 *)((unsigned long)hdr + ieee80211_hdrlen(hdr->frame_control));
+	end = (u8 *)((unsigned long)hdr + len);
+
+	/*
+	 * scan for standard WOL Magic frame
+	 *
+	 * "A physical WakeOnLAN (Magic Packet) will look like this:
+	 * ---------------------------------------------------------------
+	 * | Synchronization Stream |  Target MAC |  Password (optional) |
+	 * |  	6 octets	    |   96 octets |   0, 4 or 6		 |
+	 * ---------------------------------------------------------------
+	 *
+	 * The Synchronization Stream is defined as 6 bytes of FFh.
+	 * The Target MAC block contains 16 duplications of the IEEEaddress
+	 * of the target, with no breaks or interruptions.
+	 *
+	 * The Password field is optional, but if present, contains either
+	 * 4 bytes or 6 bytes. The WakeOnLAN dissector was implemented to
+	 * dissect the password, if present, according to the command-line
+	 * format that ether-wake uses, therefore, if a 4-byte password is
+	 * present, it will be dissected as an IPv4 address and if a 6-byte
+	 * password is present, it will be dissected as an Ethernet address.
+	 *
+	 * <http://wiki.wireshark.org/WakeOnLAN>
+	 */
+
+	while (data < end) {
+		if (found >= 6) {
+			if (*data == mac[found % 6])
+				found++;
+			else
+				found = 0;
+		}
+
+		/* previous check might reset found counter */
+		if (found < 6) {
+			if (*data == 0xff)
+				found++;
+			else
+				found = 0;
+		}
+
+		if (found == (6 + 16 * 6)) {
+			fw.suspend_mode = CARL9170_AWAKE_HOST;
+			return;
+		}
+
+		data++;
+	}
+
+	return;
+}
+#endif /* CONFIG_CARL9170FW_WOL */
+
 static unsigned int wlan_rx_filter(struct dma_desc *desc)
 {
 	struct ieee80211_hdr *hdr;
@@ -601,13 +717,11 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc)
 	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 | \
-			     AR9170_RX_ERROR_FATAL)
+#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.
@@ -647,6 +761,14 @@ 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)) {
+		if (rx_filter & CARL9170_RX_FILTER_DATA)
+			wlan_rx_wol(hdr, min(data_len,
+				    (unsigned int)AR9170_BLOCK_SIZE));
+	}
+#endif /* CONFIG_CARL9170FW_WOL */
+
 #undef AR9170_RX_ERROR_BAD
 
 	return rx_filter;
@@ -695,6 +817,7 @@ void wlan_cab_flush_queue(const unsigned int vif)
 
 		/* ready to roll! */
 		_wlan_tx(desc);
+		wlan_trigger(BIT(super->s.queue));
 	}
 }
 
@@ -936,6 +1059,7 @@ static void wlan_check_hang(void)
 				 */
 
 				wlan_dma_bump(i);
+				wlan_trigger(BIT(i));
 			}
 #endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
 		} else {