066dae93bd
The current ath9k tx queue handling code showed a few issues that could lead to locking issues, tx stalls due to stopped queues, and maybe even DMA issues. The main source of these issues is that in some places the queue is selected via skb queue mapping in places where this mapping may no longer be valid. One such place is when data frames are transmitted via the CAB queue (for powersave buffered frames). This is made even worse by a lookup WMM AC values from the assigned tx queue (which is undefined for the CAB queue). This messed up the pending frame counting, which in turn caused issues with queues getting stopped, but not woken again. To fix these issues, this patch removes an unnecessary abstraction separating a driver internal queue number from the skb queue number (not to be confused with the hardware queue number). It seems that this abstraction may have been necessary because of tx queue preinitialization from the initvals. This patch avoids breakage here by pushing the software <-> hardware queue mapping to the function that assigns the tx queues and redefining the WMM AC definitions to match the numbers used by mac80211 (also affects ath9k_htc). To ensure consistency wrt. pending frame count tracking, these counters are moved to the ath_txq struct, updated with the txq lock held, but only where the tx queue selected by the skb queue map actually matches the tx queue used by the driver for the frame. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Reported-by: Björn Smedman <bjorn.smedman@venatech.se> Signed-off-by: John W. Linville <linville@tuxdriver.com>
74 lines
2.6 KiB
C
74 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2009 Atheros Communications Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <net/mac80211.h>
|
|
|
|
#include "../ath.h"
|
|
#include "../debug.h"
|
|
|
|
#include "hw.h"
|
|
#include "hw-ops.h"
|
|
|
|
/* Common header for Atheros 802.11n base driver cores */
|
|
|
|
#define IEEE80211_WEP_NKID 4
|
|
|
|
#define WME_NUM_TID 16
|
|
#define WME_BA_BMP_SIZE 64
|
|
#define WME_MAX_BA WME_BA_BMP_SIZE
|
|
#define ATH_TID_MAX_BUFS (2 * WME_MAX_BA)
|
|
|
|
/* These must match mac80211 skb queue mapping numbers */
|
|
#define WME_AC_VO 0
|
|
#define WME_AC_VI 1
|
|
#define WME_AC_BE 2
|
|
#define WME_AC_BK 3
|
|
#define WME_NUM_AC 4
|
|
|
|
#define ATH_RSSI_DUMMY_MARKER 0x127
|
|
#define ATH_RSSI_LPF_LEN 10
|
|
#define RSSI_LPF_THRESHOLD -20
|
|
#define ATH_RSSI_EP_MULTIPLIER (1<<7)
|
|
#define ATH_EP_MUL(x, mul) ((x) * (mul))
|
|
#define ATH_RSSI_IN(x) (ATH_EP_MUL((x), ATH_RSSI_EP_MULTIPLIER))
|
|
#define ATH_LPF_RSSI(x, y, len) \
|
|
((x != ATH_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
|
|
#define ATH_RSSI_LPF(x, y) do { \
|
|
if ((y) >= RSSI_LPF_THRESHOLD) \
|
|
x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN); \
|
|
} while (0)
|
|
#define ATH_EP_RND(x, mul) \
|
|
((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
|
|
|
|
/* Defines the BT AR_BT_COEX_WGHT used */
|
|
enum ath_stomp_type {
|
|
ATH_BTCOEX_NO_STOMP,
|
|
ATH_BTCOEX_STOMP_ALL,
|
|
ATH_BTCOEX_STOMP_LOW,
|
|
ATH_BTCOEX_STOMP_NONE
|
|
};
|
|
|
|
int ath9k_cmn_padpos(__le16 frame_control);
|
|
int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);
|
|
void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
|
|
struct ieee80211_channel *chan,
|
|
enum nl80211_channel_type channel_type);
|
|
struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,
|
|
struct ath_hw *ah);
|
|
int ath9k_cmn_count_streams(unsigned int chainmask, int max);
|
|
void ath9k_cmn_btcoex_bt_stomp(struct ath_common *common,
|
|
enum ath_stomp_type stomp_type);
|