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)
{
}
}
-static uint8_t *beacon_find_ie(uint8_t ie)
+static uint8_t *beacon_find_ie(uint8_t ie, void *addr,
+ const unsigned int len)
{
- struct ieee80211_mgmt *mgmt = getp(AR9170_MAC_REG_BCN_ADDR);
+ struct ieee80211_mgmt *mgmt = addr;
uint8_t *pos, *end;
- unsigned int len;
-
- len = get(AR9170_MAC_REG_BCN_LENGTH);
-
- if (len < FCS_LEN + sizeof(mgmt))
- return NULL;
pos = mgmt->u.beacon.variable;
end = (uint8_t *) ((unsigned long)mgmt + (len - FCS_LEN));
return NULL;
}
-void wlan_cab_modify_dtim_beacon(const unsigned int vif)
+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];
} \
} 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);
}