ath10k: fix pull-push tx threshold handling
This prevents tx hangs or hiccups if pull-push
supporting firmware defines per-txq thresholds or
switches modes dynamically.
Fixes: 299468782d
("ath10k: implement wake_tx_queue")
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:

committed by
Kalle Valo

parent
9d71d47eed
commit
750eeed89c
@@ -3770,7 +3770,8 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar)
|
|||||||
|
|
||||||
/* Prevent aggressive sta/tid taking over tx queue */
|
/* Prevent aggressive sta/tid taking over tx queue */
|
||||||
max = 16;
|
max = 16;
|
||||||
while (max--) {
|
ret = 0;
|
||||||
|
while (ath10k_mac_tx_can_push(hw, txq) && max--) {
|
||||||
ret = ath10k_mac_tx_push_txq(hw, txq);
|
ret = ath10k_mac_tx_push_txq(hw, txq);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
break;
|
break;
|
||||||
@@ -4023,14 +4024,13 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,
|
|||||||
struct ath10k *ar = hw->priv;
|
struct ath10k *ar = hw->priv;
|
||||||
struct ath10k_txq *artxq = (void *)txq->drv_priv;
|
struct ath10k_txq *artxq = (void *)txq->drv_priv;
|
||||||
|
|
||||||
if (ath10k_mac_tx_can_push(hw, txq)) {
|
spin_lock_bh(&ar->txqs_lock);
|
||||||
spin_lock_bh(&ar->txqs_lock);
|
if (list_empty(&artxq->list))
|
||||||
if (list_empty(&artxq->list))
|
list_add_tail(&artxq->list, &ar->txqs);
|
||||||
list_add_tail(&artxq->list, &ar->txqs);
|
spin_unlock_bh(&ar->txqs_lock);
|
||||||
spin_unlock_bh(&ar->txqs_lock);
|
|
||||||
|
|
||||||
|
if (ath10k_mac_tx_can_push(hw, txq))
|
||||||
tasklet_schedule(&ar->htt.txrx_compl_task);
|
tasklet_schedule(&ar->htt.txrx_compl_task);
|
||||||
}
|
|
||||||
|
|
||||||
ath10k_htt_tx_txq_update(hw, txq);
|
ath10k_htt_tx_txq_update(hw, txq);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user