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)
{
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);
}
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);
}
}
}
} \
} 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);
#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);
- }
-}
-
static void wlan_check_hang(void)
{
struct dma_desc *desc;
}
#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.
wlan_dma_bump(i);
}
+#endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
} else {
/* Nothing stuck */
fw.wlan.last_tx_desc[i] = desc;
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
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 */
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);
* 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);
}
projects / carl9170fw.git / blobdiff