X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=50c48f9d27d5f440bb5e6a9d5c14eb1719cb7448;hb=2bd700be49afc4c07cf45d0b537980e35322173b;hp=9ef0ad8b1991cad358071c2b0946c47d31563381;hpb=59c208a70905fc6376383aa1e7f4f7c6811c69b3;p=carl9170fw.git diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c index 9ef0ad8..50c48f9 100644 --- a/carlfw/src/wlan.c +++ b/carlfw/src/wlan.c @@ -6,7 +6,7 @@ * Copyright (c) 2000-2005 ZyDAS Technology Corporation * Copyright (c) 2007-2009 Atheros Communications, Inc. * Copyright 2009 Johannes Berg - * Copyright 2009, 2010 Christian Lamparter + * Copyright 2009-2011 Christian Lamparter * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,19 +31,46 @@ #include "printf.h" #include "rf.h" #include "linux/ieee80211.h" +#include "wol.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) +{ + 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) { @@ -129,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; @@ -142,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 @@ -184,13 +212,66 @@ 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 bool same_hdr(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]) | /* FC + DU */ + (d0[1] ^ d1[1]) | /* addr1 */ + (d0[2] ^ d1[2]) | (d0[3] ^ d1[3]) | /* addr2 + addr3 */ + (d0[4] ^ d1[4])); /* addr3 */ +} + +static inline bool same_aggr(struct ieee80211_hdr *a, struct ieee80211_hdr *b) +{ + return (get_tid(a) == get_tid(b)) || same_hdr(a, b); +} + +static void wlan_tx_ampdu_reset(unsigned int qidx) +{ + fw.wlan.ampdu_prev[qidx] = NULL; +} + +static void wlan_tx_ampdu_end(unsigned int qidx) +{ + struct carl9170_tx_superframe *ht_prev = fw.wlan.ampdu_prev[qidx]; + + if (ht_prev) + ht_prev->f.hdr.mac.ba_end = 1; + + wlan_tx_ampdu_reset(qidx); +} + +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) { + if (ht_prev && + !same_aggr(&super->f.data.i3e, &ht_prev->f.data.i3e)) + ht_prev->f.hdr.mac.ba_end = 1; + else + super->f.hdr.mac.ba_end = 0; + + fw.wlan.ampdu_prev[qidx] = super; + } else { + wlan_tx_ampdu_end(qidx); + } +} + /* 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; @@ -209,26 +290,23 @@ static void __wlan_tx(struct dma_desc *desc) read_tsf(tsf); } -#if (defined CONFIG_CARL9170FW_LOOPBACK) || (defined CONFIG_CARL9170FW_DISCARD) - wlan_tx_complete(super, true); - unhide_super(desc); -# ifdef CONFIG_CARL9170FW_LOOPBACK - dma_put(&fw.pta.up_queue, desc); - up_trigger(); -# elif CONFIG_CARL9170FW_DISCARD - dma_reclaim(&fw.pta.down_queue, desc); - down_trigger(); -# endif -#else /* CONFIG_CARL9170FW_LOOPBACK */ + wlan_tx_ampdu(super); -# if ((defined CONFIG_CARL9170FW_DEBUG) && (defined CONFIG_CARL9170FW_PSM)) +#ifdef CONFIG_CARL9170FW_DEBUG BUG_ON(fw.phy.psm.state != CARL9170_PSM_WAKE); -# endif /* CONFIG_CARL9170FW_DEBUG && CONFIG_CARL9170FW_PSM */ +#endif /* CONFIG_CARL9170FW_DEBUG */ /* insert desc into the right queue */ - dma_put(&fw.wlan.tx_queue[queue], desc); - wlan_trigger(BIT(queue)); -#endif /* CONFIG_CARL9170FW_LOOPBACK */ + dma_put(&fw.wlan.tx_queue[super->s.queue], desc); +} + +static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif) +{ + hdr->seq_ctrl &= cpu_to_le16(~IEEE80211_SCTL_SEQ); + hdr->seq_ctrl |= cpu_to_le16(fw.wlan.sequence[vif]); + + if (ieee80211_is_first_frag(hdr->seq_ctrl)) + fw.wlan.sequence[vif] += 0x10; } /* prepares frame for the first transmission */ @@ -236,6 +314,9 @@ static void _wlan_tx(struct dma_desc *desc) { struct carl9170_tx_superframe *super = get_super(desc); + if (unlikely(super->s.assign_seq)) + wlan_assign_seq(&super->f.data.i3e, super->s.vif_id); + if (unlikely(super->s.ampdu_commit_density)) { set(AR9170_MAC_REG_AMPDU_DENSITY, MOD_VAL(AR9170_MAC_AMPDU_DENSITY, @@ -249,28 +330,33 @@ static void _wlan_tx(struct dma_desc *desc) get(AR9170_MAC_REG_AMPDU_FACTOR), 8 << super->s.ampdu_factor)); } - - __wlan_tx(desc); } /* propagate transmission status back to the driver */ 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; + bool txfail = false, success; success = true; + /* update hangcheck */ + fw.wlan.last_super_num[qidx] = 0; + if (!!(desc->ctrl & AR9170_CTRL_FAIL)) { txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL); /* reset retry indicator flags */ desc->ctrl &= ~(AR9170_CTRL_TXFAIL | AR9170_CTRL_BAFAIL); + /* + * Note: wlan_tx_consume_retry will override the old + * phy [CCK,OFDM, HT, BW20/40, MCS...] and mac vectors + * [AMPDU,RTS/CTS,...] therefore be careful when they + * are used. + */ if (wlan_tx_consume_retry(super)) { /* * retry for simple and aggregated 802.11 frames. @@ -279,7 +365,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 @@ -287,8 +373,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) { @@ -315,12 +401,12 @@ static bool wlan_tx_status(struct dma_queue *queue, * be aware of this so the frames don't get lost. */ +#ifndef CONFIG_CARL9170FW_DEBUG dma_unlink_head(queue); -#ifdef CONFIG_CARL9170FW_DELAYED_TX +#else /* CONFIG_CARL9170FW_DEBUG */ + BUG_ON(dma_unlink_head(queue) != desc); +#endif /* CONFIG_CARL9170FW_DEBUG */ dma_put(&fw.wlan.tx_retry, desc); -#else - __wlan_tx(desc); -#endif /* CONFIG_CARL9170FW_DELAYED_TX */ return true; } } else { @@ -329,7 +415,11 @@ static bool wlan_tx_status(struct dma_queue *queue, } } +#ifndef CONFIG_CARL9170FW_DEBUG dma_unlink_head(queue); +#else /* CONFIG_CARL9170FW_DEBUG */ + BUG_ON(dma_unlink_head(queue) != desc); +#endif /* CONFIG_CARL9170FW_DEBUG */ if (txfail) { /* * Issue the queue bump, @@ -342,24 +432,23 @@ static bool wlan_tx_status(struct dma_queue *queue, unhide_super(desc); - /* update hangcheck */ - fw.wlan.last_tx_desc_num[qidx] = 0; + if (unlikely(super == fw.wlan.fw_desc_data)) { + fw.wlan.fw_desc = desc; + fw.wlan.fw_desc_available = 1; + + if (fw.wlan.fw_desc_callback) + fw.wlan.fw_desc_callback(super, success); -#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ - if (unlikely(super == (void *) &dma_mem.reserved.ba)) { - fw.wlan.ba_desc = desc; - fw.wlan.ba_desc_available = 1; return true; } -#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */ - - wlan_tx_complete(super, success); #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 */ + wlan_tx_complete(super, success); + /* recycle freed descriptors */ dma_reclaim(&fw.pta.down_queue, desc); down_trigger(); @@ -369,9 +458,9 @@ static bool wlan_tx_status(struct dma_queue *queue, static void handle_tx_completion(void) { struct dma_desc *desc; - unsigned int i; + int i; - for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) { + for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) { __while_desc_bits(desc, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW) { if (!wlan_tx_status(&fw.wlan.tx_queue[i], desc)) { /* termination requested. */ @@ -379,13 +468,14 @@ static void handle_tx_completion(void) } } -#ifdef CONFIG_CARL9170FW_DELAYED_TX + wlan_tx_ampdu_reset(i); + for_each_desc(desc, &fw.wlan.tx_retry) __wlan_tx(desc); - for_each_desc(desc, &fw.wlan.tx_delay[i]) - _wlan_tx(desc); -#endif /* CONFIG_CARL9170FW_DELAYED_TX */ + wlan_tx_ampdu_end(i); + if (!queue_empty(&fw.wlan.tx_queue[i])) + wlan_trigger(BIT(i)); } } @@ -398,67 +488,73 @@ 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++; - 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 */ _wlan_tx(desc); + __wlan_tx(desc); + wlan_trigger(BIT(super->s.queue)); +} + +void wlan_tx_fw(struct carl9170_tx_superdesc *super, fw_desc_callback_t cb) +{ + if (!fw.wlan.fw_desc_available) + return; + + fw.wlan.fw_desc_available = 0; + + /* Format BlockAck */ + fw.wlan.fw_desc->ctrl = AR9170_CTRL_FS_BIT | AR9170_CTRL_LS_BIT; + fw.wlan.fw_desc->status = AR9170_OWN_BITS_SW; + + fw.wlan.fw_desc->totalLen = fw.wlan.fw_desc->dataSize = super->len; + fw.wlan.fw_desc_data = fw.wlan.fw_desc->dataAddr = super; + fw.wlan.fw_desc->nextAddr = fw.wlan.fw_desc->lastAddr = + fw.wlan.fw_desc; + fw.wlan.fw_desc_callback = cb; + wlan_tx(fw.wlan.fw_desc); } -#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ static void wlan_send_buffered_ba(void) { struct carl9170_tx_ba_superframe *baf = &dma_mem.reserved.ba.ba; struct ieee80211_ba *ba = (struct ieee80211_ba *) &baf->f.ba; struct carl9170_bar_ctx *ctx; - if (likely(fw.wlan.ba_head_idx == fw.wlan.ba_tail_idx)) + if (likely(!fw.wlan.queued_ba)) return; /* there's no point to continue when the ba_desc is not available. */ - if (!fw.wlan.ba_desc_available) + if (!fw.wlan.fw_desc_available) return; - ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx % CONFIG_CARL9170FW_BACK_REQS_NUM]; + ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx]; fw.wlan.ba_head_idx++; - - /* Format BlockAck */ - fw.wlan.ba_desc->status = 0; - fw.wlan.ba_desc->ctrl = AR9170_CTRL_FS_BIT | AR9170_CTRL_LS_BIT; - fw.wlan.ba_desc_available = 0; - fw.wlan.ba_desc->nextAddr = fw.wlan.ba_desc->lastAddr = - fw.wlan.ba_desc; - - baf->s.len = fw.wlan.ba_desc->totalLen = fw.wlan.ba_desc->dataSize = - sizeof(struct carl9170_tx_superdesc) + - sizeof(struct ar9170_tx_hwdesc) + - sizeof(struct ieee80211_ba); - - baf->s.ri[0].tries = 3; - baf->s.queue = 0; + fw.wlan.ba_head_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM; + fw.wlan.queued_ba--; + + baf->s.len = sizeof(struct carl9170_tx_superdesc) + + sizeof(struct ar9170_tx_hwdesc) + + sizeof(struct ieee80211_ba); + baf->s.ri[0].tries = 1; + baf->s.cookie = 0; + baf->s.queue = AR9170_TXQ_VO; baf->f.hdr.length = sizeof(struct ieee80211_ba) + FCS_LEN; - /* HW Duration / Backoff */ - baf->f.hdr.mac.backoff = 1; - baf->f.hdr.mac.hw_duration = 1; + baf->f.hdr.mac.no_ack = 1; - /* take the TX rate from the RX'd BAR */ - baf->f.hdr.phy.set = ctx->phy; - baf->f.hdr.phy.tx_power = 29; /* 14.5 dBm */ + baf->f.hdr.phy.modulation = 1; /* OFDM */ + baf->f.hdr.phy.tx_power = 34; /* 17 dBm */ + baf->f.hdr.phy.chains = 1; + baf->f.hdr.phy.mcs = AR9170_TXRX_PHY_RATE_OFDM_6M; /* format outgoing BA */ - ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_BACK); + ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_NULLFUNC); ba->duration = cpu_to_le16(0); memcpy(ba->ta, ctx->ta, 6); memcpy(ba->ra, ctx->ra, 6); @@ -476,37 +572,29 @@ static void wlan_send_buffered_ba(void) */ ba->control = ctx->control | cpu_to_le16(1); ba->start_seq_num = ctx->start_seq_num; - - wlan_tx(fw.wlan.ba_desc); + wlan_tx_fw(&baf->s, NULL); } static struct carl9170_bar_ctx *wlan_get_bar_cache_buffer(void) { struct carl9170_bar_ctx *tmp; - /* expire oldest entry, if we ran out of ba_ctx' */ - if (fw.wlan.ba_head_idx + CONFIG_CARL9170FW_BACK_REQS_NUM < fw.wlan.ba_tail_idx) - fw.wlan.ba_head_idx++; - - tmp = &fw.wlan.ba_cache[fw.wlan.ba_tail_idx % CONFIG_CARL9170FW_BACK_REQS_NUM]; + tmp = &fw.wlan.ba_cache[fw.wlan.ba_tail_idx]; fw.wlan.ba_tail_idx++; + fw.wlan.ba_tail_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM; + if (fw.wlan.queued_ba < CONFIG_CARL9170FW_BACK_REQS_NUM) + fw.wlan.queued_ba++; return tmp; } -static void handle_bar(struct dma_desc *desc) +static void handle_bar(struct dma_desc *desc __unused, 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 +603,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! */ @@ -546,26 +633,84 @@ static void handle_bar(struct dma_desc *desc) */ ctx->control = bar->control | cpu_to_le16(1); ctx->start_seq_num = bar->start_seq_num; - ctx->phy = ar9170_rx_to_phy(desc); - if (unlikely(!ctx->phy)) { - /* provide a backup, in case ar9170_rx_to_phy fails */ - ctx->phy = cpu_to_le32(0x2cc301); - } } -#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */ static void wlan_check_rx_overrun(void) { uint32_t overruns, total; - fw.wlan.rx_total += total = get(AR9170_MAC_REG_RX_TOTAL); - fw.wlan.rx_overruns += overruns = get(AR9170_MAC_REG_RX_OVERRUN); + fw.tally.rx_total += total = get(AR9170_MAC_REG_RX_TOTAL); + fw.tally.rx_overrun += overruns = get(AR9170_MAC_REG_RX_OVERRUN); if (unlikely(overruns)) { if (overruns == total) { DBG("RX Overrun"); fw.wlan.mac_reset++; } + + wlan_trigger(AR9170_DMA_TRIGGER_RXQ); + } +} + +static unsigned int wlan_rx_filter(struct dma_desc *desc) +{ + struct ieee80211_hdr *hdr; + unsigned int data_len; + unsigned int rx_filter; + unsigned int mac_err; + + 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: + handle_bar(desc, hdr, data_len, mac_err); + /* 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; + } + + if (unlikely(fw.suspend_mode == CARL9170_HOST_SUSPENDED)) { + wol_rx(rx_filter, hdr, min(data_len, + (unsigned int)AR9170_BLOCK_SIZE)); } + +#undef AR9170_RX_ERROR_BAD + + return rx_filter; } static void handle_rx(void) @@ -573,36 +718,54 @@ static void handle_rx(void) struct dma_desc *desc; 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 { -#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ - handle_bar(desc); -#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */ - + 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); } } } #ifdef CONFIG_CARL9170FW_CAB_QUEUE -static uint8_t *beacon_find_ie(uint8_t ie) +void wlan_cab_flush_queue(const unsigned int vif) { - struct ieee80211_mgmt *mgmt = getp(AR9170_MAC_REG_BCN_ADDR); - uint8_t *pos, *end; - unsigned int len; + struct dma_queue *cab_queue = &fw.wlan.cab_queue[vif]; + struct dma_desc *desc; - len = get(AR9170_MAC_REG_BCN_LENGTH); + /* 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); + __wlan_tx(desc); + wlan_trigger(BIT(super->s.queue)); + } +} - if (len < FCS_LEN + sizeof(mgmt)) - return NULL; +static uint8_t *beacon_find_ie(uint8_t ie, void *addr, + const unsigned int len) +{ + struct ieee80211_mgmt *mgmt = addr; + uint8_t *pos, *end; pos = mgmt->u.beacon.variable; end = (uint8_t *) ((unsigned long)mgmt + (len - FCS_LEN)); @@ -619,81 +782,71 @@ static uint8_t *beacon_find_ie(uint8_t ie) return NULL; } -static void wlan_cab_flush_queue(void) +void wlan_modify_beacon(const unsigned int vif, + const unsigned int addr, const unsigned int len) { - 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. - */ + _ie = beacon_find_ie(WLAN_EID_TIM, (void *)addr, len); + if (likely(_ie)) { + ie = (struct ieee80211_tim_ie *) &_ie[2]; - 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); - } + if (!queue_empty(&fw.wlan.cab_queue[vif]) && (ie->dtim_count == 0)) { + /* schedule DTIM transfer */ + fw.wlan.cab_flush_trigger[vif] = CARL9170_CAB_TRIGGER_ARMED; + } else if ((fw.wlan.cab_queue_len[vif] == 0) && (fw.wlan.cab_flush_trigger[vif])) { + /* undo all chances to the beacon structure */ + ie->bitmap_ctrl &= ~0x1; + fw.wlan.cab_flush_trigger[vif] = CARL9170_CAB_TRIGGER_EMPTY; + } - /* ready to roll! */ - _wlan_tx(desc); + /* 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; } } - /* Transfer finished - waiting for tx status */ - fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_DEFER; + /* + * Ideally, the sequence number should be assigned by the TX arbiter + * hardware. But AFAIK that's not possible, so we have to go for the + * next best thing and write it into the beacon fifo during the open + * beacon update window. + */ + + wlan_assign_seq((struct ieee80211_hdr *)addr, vif); } -static void wlan_cab_modify_dtim_beacon(void) +static void wlan_send_buffered_cab(void) { - uint8_t *_ie; - struct ieee80211_tim_ie *ie; + unsigned int i; - _ie = beacon_find_ie(WLAN_EID_TIM); - if (likely(_ie)) { - ie = (struct ieee80211_tim_ie *) &_ie[2]; + for (i = 0; i < CARL9170_INTF_NUM; i++) { + if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_ARMED)) { + /* + * This is hardcoded into carl9170usb driver. + * + * The driver must set the PRETBTT event to beacon_interval - + * CARL9170_PRETBTT_KUS (usually 6) Kus. + * + * But still, we can only do so much about 802.11-2007 9.3.2.1 & + * 11.2.1.6. Let's hope the current solution is adequate enough. + */ - if (!queue_empty(&fw.wlan.cab_queue) && (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)) { - /* undo all chances to the beacon structure */ - ie->bitmap_ctrl &= ~0x1; - fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_EMPTY; - } + if (is_after_msecs(fw.wlan.cab_flush_time, (CARL9170_TBTT_DELTA))) { + wlan_cab_flush_queue(i); - if (fw.wlan.cab_flush_trigger) { - /* Set the almighty Multicast Traffic Indication Bit. */ - ie->bitmap_ctrl |= 0x1; + /* + * 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[i] = CARL9170_CAB_TRIGGER_DEFER; + } } + } } #endif /* CONFIG_CARL9170FW_CAB_QUEUE */ @@ -702,16 +855,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); @@ -723,15 +866,12 @@ static void handle_pretbtt(void) fw.wlan.cab_flush_time = get_clock_counter(); #endif /* CONFIG_CARL9170FW_CAB_QUEUE */ -#ifdef CONFIG_CARL9170FW_PSM +#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS rf_psm(); send_cmd_to_host(4, CARL9170_RSP_PRETBTT, 0x00, (uint8_t *) &fw.phy.psm.state); -#else - send_cmd_to_host(0, CARL9170_RSP_PRETBTT, 0x00, NULL); -#endif /* CONFIG_CARL9170FW_PSM */ - +#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */ } static void handle_atim(void) @@ -758,36 +898,14 @@ static void handle_radar(void) static void wlan_janitor(void) { #ifdef CONFIG_CARL9170FW_CAB_QUEUE - if (unlikely(fw.wlan.cab_flush_trigger)) { - /* - * This is hardcoded into carl9170usb driver. - * - * The driver must set the PRETBTT event to beacon_interval - - * CARL9170_PRETBTT_KUS (usually 6) Kus. - * - * But still, we can only do so much about 802.11-2007 9.3.2.1 & - * 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(); - } - } + wlan_send_buffered_cab(); #endif /* CONFIG_CARL9170FW_CAB_QUEUE */ -#ifdef CONFIG_CARL9170FW_DELAYED_TX - if (fw.wlan.tx_trigger) { - _wlan_trigger(fw.wlan.tx_trigger); - fw.wlan.tx_trigger = 0; - } -#endif /* CONFIG_CARL9170FW_DELAYED_TX */ - wlan_send_buffered_tx_status(); -#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ wlan_send_buffered_ba(); -#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */ + + wol_janitor(); } void handle_wlan(void) @@ -805,6 +923,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); @@ -830,51 +951,31 @@ 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); - } -} +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; - unsigned int i; + int i; - for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) { + for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) { if (queue_empty(&fw.wlan.tx_queue[i])) { /* Nothing to do here... move along */ continue; } /* fetch the current DMA queue position */ - desc = get_wlan_txq_addr(i); + desc = (struct dma_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) * @@ -887,7 +988,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 @@ -899,22 +1000,26 @@ static void wlan_check_hang(void) } #endif /* CONFIG_CARL9170FW_DEBUG */ - if (unlikely(fw.wlan.last_tx_desc_num[i] > 3)) { +#ifdef CONFIG_CARL9170FW_DMA_QUEUE_BUMP + 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. */ wlan_dma_bump(i); + wlan_trigger(BIT(i)); } +#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; } } } +#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. @@ -931,13 +1036,16 @@ static void wlan_mac_reset(void) uint32_t cam_mode; uint32_t ack_power; uint32_t rts_cts_tpc; - unsigned int i; + uint32_t rts_cts_rate; + int i; #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS uint32_t rx_BB; #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */ - ERR("MAC RESET"); +#ifdef CONFIG_CARL9170FW_NOISY_MAC_RESET + INFO("MAC RESET"); +#endif /* CONFIG_CARL9170FW_NOISY_MAC_RESET */ /* Save aggregation parameters */ agg_wait_counter = get(AR9170_MAC_REG_AMPDU_FACTOR); @@ -951,6 +1059,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 */ @@ -992,6 +1101,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); @@ -1003,20 +1113,58 @@ static void wlan_mac_reset(void) * set(AR9170_PHY_REG_CCA_THRESHOLD, 0x0); */ - 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); + val = AR9170_DMA_TRIGGER_RXQ; + /* Reinitialize all WLAN TX DMA queues. */ + for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) { + 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])) - wlan_trigger(BIT(i)); + /* 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); + + 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); + wlan_trigger(val); +} +#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) {