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)
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;
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);
# 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 */
}
for_each_desc(desc, &fw.wlan.tx_delay[i])
_wlan_tx(desc);
#endif /* CONFIG_CARL9170FW_DELAYED_TX */
+ wlan_trigger(BIT(i));
}
}
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]++;
}
#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
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
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!
*/
}
}
-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);
}
}
}
*/
wlan_dma_bump(i);
+ wlan_trigger(BIT(i));
}
#endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
} else {
projects / carl9170fw.git / blobdiff