From: Christian Lamparter Date: Sat, 7 Jul 2012 15:55:08 +0000 (+0200) Subject: Merge branch 'master' of git://github.com/chunkeey/carl9170fw X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=12cc2cc355d1dce3d50c78e0f680b3cda0c73dfe;hp=38ec506630dd92a5e6a03e6caca08fb926be85ae Merge branch 'master' of git://github.com/chunkeey/carl9170fw --- diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h index d10a74e..cb16415 100644 --- a/carlfw/include/carl9170.h +++ b/carlfw/include/carl9170.h @@ -142,6 +142,8 @@ struct firmware_context_struct { unsigned int ba_tail_idx, ba_head_idx, queued_ba; + + unsigned int queued_bar; } wlan; struct { diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c index fde4a5d..5bde675 100644 --- a/carlfw/src/fw.c +++ b/carlfw/src/fw.c @@ -38,6 +38,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = { BIT(CARL9170FW_HANDLE_BACK_REQ) | BIT(CARL9170FW_RX_FILTER) | BIT(CARL9170FW_HW_COUNTERS) | + BIT(CARL9170FW_RX_BA_FILTER) | BIT(CARL9170FW_USB_INIT_FIRMWARE) | #ifdef CONFIG_CARL9170FW_USB_UP_STREAM BIT(CARL9170FW_USB_UP_STREAM) | diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c index b8d4ec4..d3328d6 100644 --- a/carlfw/src/wlan.c +++ b/carlfw/src/wlan.c @@ -457,20 +457,12 @@ static bool wlan_tx_status(struct dma_queue *queue, fw.wlan.cab_queue_len[super->s.vif_id]--; #endif /* CONFIG_CARL9170FW_CAB_QUEUE */ - if (unlikely(ieee80211_is_back_req(super->f.data.i3e.frame_control))) { - /* - * As explained above, the hardware seems to be - * incapable of matching BA to BARs. This is a - * problem especially with mac80211, because it - * does resent failed BARs which of course cause - * some mayhem in the receiver buffer at the HT - * peer on the other end. - */ - success = true; - } - wlan_tx_complete(super, success); + if (ieee80211_is_back_req(super->f.data.i3e.frame_control)) { + fw.wlan.queued_bar--; + } + /* recycle freed descriptors */ dma_reclaim(&fw.pta.down_queue, desc); down_trigger(); @@ -505,6 +497,10 @@ void __hot wlan_tx(struct dma_desc *desc) { struct carl9170_tx_superframe *super = DESC_PAYLOAD(desc); + if (ieee80211_is_back_req(super->f.data.i3e.frame_control)) { + fw.wlan.queued_bar++; + } + /* initialize rate control struct */ super->s.rix = 0; super->s.cnt = 1; @@ -578,8 +574,10 @@ static void wlan_send_buffered_ba(void) /* format outgoing BA */ ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_BACK); ba->duration = cpu_to_le16(0); - memcpy(ba->ta, ctx->ta, 6); - memcpy(ba->ra, ctx->ra, 6); + + /* the BAR contains all necessary MACs. All we need is to swap them */ + memcpy(ba->ra, ctx->ta, 6); + memcpy(ba->ta, ctx->ra, 6); /* * Unfortunately, we cannot look into the hardware's scoreboard. @@ -588,7 +586,11 @@ static void wlan_send_buffered_ba(void) */ memset(ba->bitmap, 0x0, sizeof(ba->bitmap)); - ba->control = ctx->control; + /* + * Both, the original firmare and ath9k set the NO ACK flag in + * the BA Ack Policy subfield. + */ + ba->control = ctx->control | cpu_to_le16(1); ba->start_seq_num = ctx->start_seq_num; wlan_tx_fw(&baf->s, NULL); } @@ -640,9 +642,8 @@ static void handle_bar(struct dma_desc *desc __unused, struct ieee80211_hdr *hdr ctx = wlan_get_bar_cache_buffer(); - /* Brilliant! The BAR provides all necessary MACs! */ - memcpy(ctx->ra, bar->ta, 6); - memcpy(ctx->ta, bar->ra, 6); + memcpy(ctx->ra, bar->ra, 6); + memcpy(ctx->ta, bar->ta, 6); ctx->control = bar->control; ctx->start_seq_num = bar->start_seq_num; } @@ -700,12 +701,22 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc) 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; + case IEEE80211_STYPE_BACK: + if (fw.wlan.queued_bar) { + /* + * Don't filter block acks when the application + * has queued BARs. This is because the firmware + * can't do the accouting and the application + * has to sort out if the BA belongs to any BARs. + */ + break; + } + /* otherwise fall through */ default: rx_filter |= CARL9170_RX_FILTER_CTL_OTHER; break; diff --git a/include/shared/fwdesc.h b/include/shared/fwdesc.h index 6d9c089..66848d4 100644 --- a/include/shared/fwdesc.h +++ b/include/shared/fwdesc.h @@ -78,6 +78,9 @@ enum carl9170fw_feature_list { /* HW (ANI, CCA, MIB) tally counters */ CARL9170FW_HW_COUNTERS, + /* Firmware will pass BA when BARs are queued */ + CARL9170FW_RX_BA_FILTER, + /* KEEP LAST */ __CARL9170FW_FEATURE_NUM }; diff --git a/include/shared/version.h b/include/shared/version.h index 9fa241e..2ec3e91 100644 --- a/include/shared/version.h +++ b/include/shared/version.h @@ -1,7 +1,7 @@ #ifndef __CARL9170_SHARED_VERSION_H #define __CARL9170_SHARED_VERSION_H #define CARL9170FW_VERSION_YEAR 12 -#define CARL9170FW_VERSION_MONTH 3 -#define CARL9170FW_VERSION_DAY 14 -#define CARL9170FW_VERSION_GIT "1.9.5" +#define CARL9170FW_VERSION_MONTH 7 +#define CARL9170FW_VERSION_DAY 7 +#define CARL9170FW_VERSION_GIT "1.9.6" #endif /* __CARL9170_SHARED_VERSION_H */ diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c index 995e3ed..0d5cd09 100644 --- a/tools/src/fwinfo.c +++ b/tools/src/fwinfo.c @@ -68,6 +68,7 @@ static const struct feature_list known_otus_features_v1[] = { CHECK_FOR_FEATURE(CARL9170FW_WOL), CHECK_FOR_FEATURE(CARL9170FW_FIXED_5GHZ_PSM), CHECK_FOR_FEATURE(CARL9170FW_HW_COUNTERS), + CHECK_FOR_FEATURE(CARL9170FW_RX_BA_FILTER), }; static void check_feature_list(const struct carl9170fw_desc_head *head,