}
/* 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;
*/
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
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_tx_desc_num[qidx] = 0;
+ fw.wlan.last_super_num[qidx] = 0;
if (!!(desc->ctrl & AR9170_CTRL_FAIL)) {
txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL);
* 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
* 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) {
unhide_super(desc);
-#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);
static void handle_tx_completion(void)
{
struct dma_desc *desc;
- unsigned int map = 0;
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. */
wlan_tx_ampdu_end(i);
if (!queue_empty(&fw.wlan.tx_queue[i]))
- map |= BIT(i);
-
+ wlan_trigger(BIT(i));
}
- wlan_trigger(map);
}
void __hot wlan_tx(struct dma_desc *desc)
wlan_trigger(BIT(super->s.queue));
}
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
static void wlan_send_buffered_ba(void)
{
struct carl9170_tx_ba_superframe *baf = &dma_mem.reserved.ba.ba;
if (!fw.wlan.ba_desc_available)
return;
- ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx % CONFIG_CARL9170FW_BACK_REQS_NUM];
+ fw.wlan.ba_desc_available = 0;
+
+ ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx];
fw.wlan.ba_head_idx++;
+ fw.wlan.ba_head_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM;
/* Format BlockAck */
- fw.wlan.ba_desc->status = 0;
+ fw.wlan.ba_desc->status = AR9170_OWN_BITS_SW;
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;
sizeof(struct ar9170_tx_hwdesc) +
sizeof(struct ieee80211_ba);
- baf->s.ri[0].tries = 3;
- baf->s.queue = 0;
+ baf->s.ri[0].tries = 1;
+ baf->s.queue = AR9170_TXQ_VO;
baf->f.hdr.length = sizeof(struct ieee80211_ba) + FCS_LEN;
/* HW Duration / Backoff */
{
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;
return tmp;
}
ctx->phy = cpu_to_le32(0x2cc301);
}
}
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
static void wlan_check_rx_overrun(void)
{
} 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, hdr, data_len, mac_err);
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
/* fallthrough */
rx_filter |= CARL9170_RX_FILTER_CTL_BACKR;
break;
wlan_send_buffered_tx_status();
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
wlan_send_buffered_ba();
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
}
void handle_wlan(void)
#undef HANDLER
}
+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;
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)
*
}
#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
#endif /* CONFIG_CARL9170FW_DEBUG */
#ifdef CONFIG_CARL9170FW_DMA_QUEUE_BUMP
- if (unlikely(fw.wlan.last_tx_desc_num[i] > 3)) {
+ 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.
#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;
}
}
}
uint32_t ack_power;
uint32_t rts_cts_tpc;
uint32_t rts_cts_rate;
- unsigned int i;
+ int i;
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
uint32_t rx_BB;
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
+#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);
val = AR9170_DMA_TRIGGER_RXQ;
/* Reinitialize all WLAN TX DMA queues. */
- for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+ for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
struct dma_desc *iter;
__for_each_desc_bits(iter, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW);
+ /* 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);