X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=36d4b86bf776ed898bb401ea54b64c84f114b398;hp=aaff3eeaf9bb2555cd6aa86f035e149060c1ab64;hb=1cdca4d5817d287c36611e6120042a6057df7e0e;hpb=e72388a0aa23da8bc8e24a0cbe9d523c5a9ce294 diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c index aaff3ee..36d4b86 100644 --- a/carlfw/src/wlan.c +++ b/carlfw/src/wlan.c @@ -38,6 +38,7 @@ 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)); @@ -69,6 +70,7 @@ static void wlan_dma_bump(unsigned int qidx) wlan_txupdate(qidx); } } +#endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */ #ifdef CONFIG_CARL9170FW_DEBUG static void wlan_dump_queue(unsigned int qidx) @@ -181,7 +183,7 @@ static void wlan_tx_complete(struct carl9170_tx_superframe *super, static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super) { /* check if this was the last possible retry with this rate */ - if (unlikely(super->s.cnt >= super->s.tries[super->s.rix])) { + if (unlikely(super->s.cnt >= super->s.ri[super->s.rix].tries)) { /* end of the road - indicate tx failure */ if (unlikely(super->s.rix == CARL9170_TX_MAX_RETRY_RATES)) return false; @@ -196,6 +198,10 @@ static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super) /* finally - mark the old rate as USED */ super->s.rix++; + /* 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; } else { @@ -287,7 +293,10 @@ static bool wlan_tx_status(struct dma_queue *queue, success = true; - if (!!(desc->ctrl & AR9170_CTRL_FAIL_MASK)) { + /* update hangcheck */ + fw.wlan.last_tx_desc_num[qidx] = 0; + + if (!!(desc->ctrl & AR9170_CTRL_FAIL)) { txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL); /* reset retry indicator flags */ @@ -364,9 +373,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; @@ -379,7 +385,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 */ @@ -420,6 +426,14 @@ void __hot wlan_tx(struct dma_desc *desc) super->s.cnt = 1; hide_super(desc); +#ifdef CONFIG_CARL9170FW_CAB_QUEUE + if (unlikely(super->s.cab)) { + 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 */ + #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); @@ -427,14 +441,6 @@ void __hot wlan_tx(struct dma_desc *desc) } #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); - return; - } -#endif /* CONFIG_CARL9170FW_CAB_QUEUE */ - _wlan_tx(desc); } @@ -467,7 +473,7 @@ static void wlan_send_buffered_ba(void) sizeof(struct ar9170_tx_hwdesc) + sizeof(struct ieee80211_ba); - baf->s.tries[0] = 3; + baf->s.ri[0].tries = 3; baf->s.queue = 0; baf->f.hdr.length = sizeof(struct ieee80211_ba) + FCS_LEN; @@ -516,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 @@ -537,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! */ @@ -587,46 +586,121 @@ static void wlan_check_rx_overrun(void) DBG("RX Overrun"); fw.wlan.mac_reset++; } + + wlan_trigger(AR9170_DMA_TRIGGER_RXQ); } } -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; - wlan_check_rx_overrun(); + data_len = ar9170_get_rx_mpdu_len(desc); + mac_err = ar9170_get_rx_macstatus_error(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 { +#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); } } } #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; + + /* 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); + } - len = get(AR9170_MAC_REG_BCN_LENGTH); + /* ready to roll! */ + _wlan_tx(desc); + } +} - 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)); @@ -643,78 +717,27 @@ 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, + 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]; - 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)) { + 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 = CARL9170_CAB_TRIGGER_EMPTY; + fw.wlan.cab_flush_trigger[vif] = CARL9170_CAB_TRIGGER_EMPTY; } - if (fw.wlan.cab_flush_trigger) { + /* 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; } @@ -726,19 +749,11 @@ 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); + + set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY); } static void handle_pretbtt(void) @@ -755,7 +770,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) @@ -782,21 +796,33 @@ 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. - */ + unsigned int i; + + 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 (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(i); + + /* + * 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 */ @@ -829,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); @@ -897,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. @@ -905,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; @@ -913,6 +944,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. @@ -929,13 +961,14 @@ 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 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); @@ -949,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 */ @@ -990,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); @@ -1001,20 +1036,34 @@ 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); } +#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) {