mirror of
https://github.com/torvalds/linux
synced 2024-09-23 12:56:39 +00:00
ath9k_htc: Initialize beacon/CAB queues
This patch initializes the beacon and CAB HW queues when the driver is loaded. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
2edb4583c6
commit
ca74b83b66
|
@ -393,6 +393,9 @@ struct ath9k_htc_priv {
|
||||||
int led_off_duration;
|
int led_off_duration;
|
||||||
int led_on_cnt;
|
int led_on_cnt;
|
||||||
int led_off_cnt;
|
int led_off_cnt;
|
||||||
|
|
||||||
|
int beaconq;
|
||||||
|
int cabq;
|
||||||
int hwq_map[ATH9K_WME_AC_VO+1];
|
int hwq_map[ATH9K_WME_AC_VO+1];
|
||||||
|
|
||||||
#ifdef CONFIG_ATH9K_HTC_DEBUGFS
|
#ifdef CONFIG_ATH9K_HTC_DEBUGFS
|
||||||
|
@ -429,6 +432,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb);
|
||||||
void ath9k_tx_cleanup(struct ath9k_htc_priv *priv);
|
void ath9k_tx_cleanup(struct ath9k_htc_priv *priv);
|
||||||
bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
|
bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
|
||||||
enum ath9k_tx_queue_subtype qtype);
|
enum ath9k_tx_queue_subtype qtype);
|
||||||
|
int ath9k_htc_cabq_setup(struct ath9k_htc_priv *priv);
|
||||||
int get_hw_qnum(u16 queue, int *hwq_map);
|
int get_hw_qnum(u16 queue, int *hwq_map);
|
||||||
int ath_htc_txq_update(struct ath9k_htc_priv *priv, int qnum,
|
int ath_htc_txq_update(struct ath9k_htc_priv *priv, int qnum,
|
||||||
struct ath9k_tx_queue_info *qinfo);
|
struct ath9k_tx_queue_info *qinfo);
|
||||||
|
|
|
@ -420,6 +420,20 @@ static int ath9k_init_queues(struct ath9k_htc_priv *priv)
|
||||||
for (i = 0; i < ARRAY_SIZE(priv->hwq_map); i++)
|
for (i = 0; i < ARRAY_SIZE(priv->hwq_map); i++)
|
||||||
priv->hwq_map[i] = -1;
|
priv->hwq_map[i] = -1;
|
||||||
|
|
||||||
|
priv->beaconq = ath9k_hw_beaconq_setup(priv->ah);
|
||||||
|
if (priv->beaconq == -1) {
|
||||||
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
|
"Unable to setup BEACON xmit queue\n");
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
priv->cabq = ath9k_htc_cabq_setup(priv);
|
||||||
|
if (priv->cabq == -1) {
|
||||||
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
|
"Unable to setup CAB xmit queue\n");
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BE)) {
|
if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BE)) {
|
||||||
ath_print(common, ATH_DBG_FATAL,
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
"Unable to setup xmit queue for BE traffic\n");
|
"Unable to setup xmit queue for BE traffic\n");
|
||||||
|
|
|
@ -20,6 +20,16 @@
|
||||||
/* TX */
|
/* TX */
|
||||||
/******/
|
/******/
|
||||||
|
|
||||||
|
#define ATH9K_HTC_INIT_TXQ(subtype) do { \
|
||||||
|
qi.tqi_subtype = subtype; \
|
||||||
|
qi.tqi_aifs = ATH9K_TXQ_USEDEFAULT; \
|
||||||
|
qi.tqi_cwmin = ATH9K_TXQ_USEDEFAULT; \
|
||||||
|
qi.tqi_cwmax = ATH9K_TXQ_USEDEFAULT; \
|
||||||
|
qi.tqi_physCompBuf = 0; \
|
||||||
|
qi.tqi_qflags = TXQ_FLAG_TXEOLINT_ENABLE | \
|
||||||
|
TXQ_FLAG_TXDESCINT_ENABLE; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
int get_hw_qnum(u16 queue, int *hwq_map)
|
int get_hw_qnum(u16 queue, int *hwq_map)
|
||||||
{
|
{
|
||||||
switch (queue) {
|
switch (queue) {
|
||||||
|
@ -297,13 +307,7 @@ bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
|
||||||
int qnum;
|
int qnum;
|
||||||
|
|
||||||
memset(&qi, 0, sizeof(qi));
|
memset(&qi, 0, sizeof(qi));
|
||||||
|
ATH9K_HTC_INIT_TXQ(subtype);
|
||||||
qi.tqi_subtype = subtype;
|
|
||||||
qi.tqi_aifs = ATH9K_TXQ_USEDEFAULT;
|
|
||||||
qi.tqi_cwmin = ATH9K_TXQ_USEDEFAULT;
|
|
||||||
qi.tqi_cwmax = ATH9K_TXQ_USEDEFAULT;
|
|
||||||
qi.tqi_physCompBuf = 0;
|
|
||||||
qi.tqi_qflags = TXQ_FLAG_TXEOLINT_ENABLE | TXQ_FLAG_TXDESCINT_ENABLE;
|
|
||||||
|
|
||||||
qnum = ath9k_hw_setuptxqueue(priv->ah, ATH9K_TX_QUEUE_DATA, &qi);
|
qnum = ath9k_hw_setuptxqueue(priv->ah, ATH9K_TX_QUEUE_DATA, &qi);
|
||||||
if (qnum == -1)
|
if (qnum == -1)
|
||||||
|
@ -321,6 +325,16 @@ bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ath9k_htc_cabq_setup(struct ath9k_htc_priv *priv)
|
||||||
|
{
|
||||||
|
struct ath9k_tx_queue_info qi;
|
||||||
|
|
||||||
|
memset(&qi, 0, sizeof(qi));
|
||||||
|
ATH9K_HTC_INIT_TXQ(0);
|
||||||
|
|
||||||
|
return ath9k_hw_setuptxqueue(priv->ah, ATH9K_TX_QUEUE_CAB, &qi);
|
||||||
|
}
|
||||||
|
|
||||||
/******/
|
/******/
|
||||||
/* RX */
|
/* RX */
|
||||||
/******/
|
/******/
|
||||||
|
|
Loading…
Reference in a new issue