Add wake_tx_queue mac op to support AQL and support
txq dequeueing from mac80211. Also implement a
simple scheduler for pulling all skbs from txqs
of all AC's at the end of tx completion NAPI.
Tested-on: IPQ5018 hw1.0 AHB WLAN.HK.2.6.0.1-00861-QCAHKSWPL_SILICONZ-1
Signed-off-by: Tamizh Chelvam Raja <[email protected]>
---
drivers/net/wireless/ath/ath11k/dp_tx.c | 11 ++++
drivers/net/wireless/ath/ath11k/mac.c | 70 ++++++++++++++++++++++---
drivers/net/wireless/ath/ath11k/mac.h | 1 +
3 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c
index 08a28464eb7a..bb1fed197707 100644
--- a/drivers/net/wireless/ath/ath11k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
@@ -681,12 +681,14 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)
struct ath11k_dp *dp = &ab->dp;
int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id;
struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id];
+ bool mac_id_scheduled[MAX_RADIOS];
struct sk_buff *msdu;
struct hal_tx_status ts = { 0 };
struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id];
u32 *desc;
u32 msdu_id;
u8 mac_id;
+ int i;
spin_lock_bh(&status_ring->lock);
@@ -751,6 +753,15 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)
wake_up(&ar->dp.tx_empty_waitq);
ath11k_dp_tx_complete_msdu(ar, msdu, &ts);
+ mac_id_scheduled[mac_id] = true;
+ }
+
+ /* Schedule remaining Tx packets for the radio */
+ for (i = 0; i < MAX_RADIOS; i++) {
+ if (!mac_id_scheduled[i])
+ continue;
+ ar = ab->pdevs[i].ar;
+ ath11k_mac_tx_push_pending(ar);
}
}
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 1c93f1afccc5..4dc76b5ba77f 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -5907,9 +5907,9 @@ static int ath11k_mac_mgmt_tx(struct ath11k *ar, struct sk_buff *skb,
return 0;
}
-static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
- struct ieee80211_tx_control *control,
- struct sk_buff *skb)
+static void ath11k_mac_tx(struct ieee80211_hw *hw,
+ struct ieee80211_sta *sta,
+ struct sk_buff *skb)
{
struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb);
struct ath11k *ar = hw->priv;
@@ -5944,8 +5944,8 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
return;
}
- if (control->sta)
- arsta = (struct ath11k_sta *)control->sta->drv_priv;
+ if (sta)
+ arsta = (struct ath11k_sta *)sta->drv_priv;
ret = ath11k_dp_tx(ar, arvif, arsta, skb);
if (unlikely(ret)) {
@@ -5954,6 +5954,62 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
}
}
+static void ath11k_mac_schedule_txq(struct ieee80211_hw *hw, u32 ac)
+{
+ struct ieee80211_txq *txq;
+ struct sk_buff *skb;
+
+ ieee80211_txq_schedule_start(hw, ac);
+ while ((txq = ieee80211_next_txq(hw, ac))) {
+ while ((skb = ieee80211_tx_dequeue_ni(hw, txq)))
+ ath11k_mac_tx(hw, txq->sta, skb);
+
+ ieee80211_return_txq(hw, txq, false);
+ }
+ ieee80211_txq_schedule_end(hw, ac);
+}
+
+void ath11k_mac_tx_push_pending(struct ath11k *ar)
+{
+ struct ieee80211_hw *hw = ar->hw;
+ u32 ac;
+
+ rcu_read_lock();
+ for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+ ath11k_mac_schedule_txq(hw, ac);
+
+ rcu_read_unlock();
+}
+
+static void ath11k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,
+ struct ieee80211_txq *txq)
+{
+ u8 ac;
+ struct sk_buff *skb;
+
+ ac = txq->ac;
+ ieee80211_txq_schedule_start(hw, ac);
+ txq = ieee80211_next_txq(hw, ac);
+
+ if (!txq)
+ goto out;
+
+ while ((skb = ieee80211_tx_dequeue_ni(hw, txq)))
+ ath11k_mac_tx(hw, txq->sta, skb);
+
+ ieee80211_return_txq(hw, txq, false);
+
+out:
+ ieee80211_txq_schedule_end(hw, ac);
+}
+
+static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
+ struct ieee80211_tx_control *control,
+ struct sk_buff *skb)
+{
+ ath11k_mac_tx(hw, control->sta, skb);
+}
+
void ath11k_mac_drain_tx(struct ath11k *ar)
{
/* make sure rcu-protected mac80211 tx path itself is drained */
@@ -8763,7 +8819,7 @@ static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw,
static const struct ieee80211_ops ath11k_ops = {
.tx = ath11k_mac_op_tx,
- .wake_tx_queue = ieee80211_handle_wake_tx_queue,
+ .wake_tx_queue = ath11k_mac_op_wake_tx_queue,
.start = ath11k_mac_op_start,
.stop = ath11k_mac_op_stop,
.reconfig_complete = ath11k_mac_op_reconfig_complete,
@@ -9263,6 +9319,8 @@ static int __ath11k_mac_register(struct ath11k *ar)
ab->hw_params.bios_sar_capa)
ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa;
+ wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL);
+
ret = ieee80211_register_hw(ar->hw);
if (ret) {
ath11k_err(ar->ab, "ieee80211 registration failed: %d\n", ret);
diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h
index 0231783ad754..15517e9a3408 100644
--- a/drivers/net/wireless/ath/ath11k/mac.h
+++ b/drivers/net/wireless/ath/ath11k/mac.h
@@ -175,4 +175,5 @@ int ath11k_mac_wait_tx_complete(struct ath11k *ar);
int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif,
enum wmi_sta_keepalive_method method,
u32 interval);
+void ath11k_mac_tx_push_pending(struct ath11k *ar);
#endif
base-commit: 12f167f02a1abe2c8817496a902de00758285b92
--
2.17.1
On 5/1/2023 6:07 AM, Tamizh Chelvam Raja wrote:
> Add wake_tx_queue mac op to support AQL and support
> txq dequeueing from mac80211. Also implement a
> simple scheduler for pulling all skbs from txqs
> of all AC's at the end of tx completion NAPI.
>
#1 rule of commit text: describe why
be sure describe any measured benefit
> Tested-on: IPQ5018 hw1.0 AHB WLAN.HK.2.6.0.1-00861-QCAHKSWPL_SILICONZ-1
>
> Signed-off-by: Tamizh Chelvam Raja <[email protected]>
> ---
> drivers/net/wireless/ath/ath11k/dp_tx.c | 11 ++++
> drivers/net/wireless/ath/ath11k/mac.c | 70 ++++++++++++++++++++++---
> drivers/net/wireless/ath/ath11k/mac.h | 1 +
> 3 files changed, 76 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c
> index 08a28464eb7a..bb1fed197707 100644
> --- a/drivers/net/wireless/ath/ath11k/dp_tx.c
> +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c
> @@ -681,12 +681,14 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)
> struct ath11k_dp *dp = &ab->dp;
> int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id;
> struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id];
> + bool mac_id_scheduled[MAX_RADIOS];
> struct sk_buff *msdu;
> struct hal_tx_status ts = { 0 };
> struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id];
> u32 *desc;
> u32 msdu_id;
> u8 mac_id;
> + int i;
>
> spin_lock_bh(&status_ring->lock);
>
> @@ -751,6 +753,15 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id)
> wake_up(&ar->dp.tx_empty_waitq);
>
> ath11k_dp_tx_complete_msdu(ar, msdu, &ts);
> + mac_id_scheduled[mac_id] = true;
> + }
> +
> + /* Schedule remaining Tx packets for the radio */
> + for (i = 0; i < MAX_RADIOS; i++) {
> + if (!mac_id_scheduled[i])
> + continue;
> + ar = ab->pdevs[i].ar;
> + ath11k_mac_tx_push_pending(ar);
> }
> }
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index 1c93f1afccc5..4dc76b5ba77f 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -5907,9 +5907,9 @@ static int ath11k_mac_mgmt_tx(struct ath11k *ar, struct sk_buff *skb,
> return 0;
> }
>
> -static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
> - struct ieee80211_tx_control *control,
> - struct sk_buff *skb)
> +static void ath11k_mac_tx(struct ieee80211_hw *hw,
> + struct ieee80211_sta *sta,
> + struct sk_buff *skb)
> {
> struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb);
> struct ath11k *ar = hw->priv;
> @@ -5944,8 +5944,8 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
> return;
> }
>
> - if (control->sta)
> - arsta = (struct ath11k_sta *)control->sta->drv_priv;
> + if (sta)
> + arsta = (struct ath11k_sta *)sta->drv_priv;
>
> ret = ath11k_dp_tx(ar, arvif, arsta, skb);
> if (unlikely(ret)) {
> @@ -5954,6 +5954,62 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
> }
> }
>
> +static void ath11k_mac_schedule_txq(struct ieee80211_hw *hw, u32 ac)
> +{
> + struct ieee80211_txq *txq;
> + struct sk_buff *skb;
> +
> + ieee80211_txq_schedule_start(hw, ac);
> + while ((txq = ieee80211_next_txq(hw, ac))) {
> + while ((skb = ieee80211_tx_dequeue_ni(hw, txq)))
> + ath11k_mac_tx(hw, txq->sta, skb);
> +
> + ieee80211_return_txq(hw, txq, false);
> + }
> + ieee80211_txq_schedule_end(hw, ac);
> +}
> +
> +void ath11k_mac_tx_push_pending(struct ath11k *ar)
> +{
> + struct ieee80211_hw *hw = ar->hw;
> + u32 ac;
> +
> + rcu_read_lock();
> + for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
> + ath11k_mac_schedule_txq(hw, ac);
> +
> + rcu_read_unlock();
> +}
> +
> +static void ath11k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,
> + struct ieee80211_txq *txq)
> +{
> + u8 ac;
> + struct sk_buff *skb;
> +
> + ac = txq->ac;
> + ieee80211_txq_schedule_start(hw, ac);
> + txq = ieee80211_next_txq(hw, ac);
> +
> + if (!txq)
> + goto out;
> +
> + while ((skb = ieee80211_tx_dequeue_ni(hw, txq)))
> + ath11k_mac_tx(hw, txq->sta, skb);
> +
> + ieee80211_return_txq(hw, txq, false);
> +
> +out:
> + ieee80211_txq_schedule_end(hw, ac);
> +}
> +
> +static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
> + struct ieee80211_tx_control *control,
> + struct sk_buff *skb)
> +{
> + ath11k_mac_tx(hw, control->sta, skb);
> +}
> +
> void ath11k_mac_drain_tx(struct ath11k *ar)
> {
> /* make sure rcu-protected mac80211 tx path itself is drained */
> @@ -8763,7 +8819,7 @@ static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw,
>
> static const struct ieee80211_ops ath11k_ops = {
> .tx = ath11k_mac_op_tx,
> - .wake_tx_queue = ieee80211_handle_wake_tx_queue,
> + .wake_tx_queue = ath11k_mac_op_wake_tx_queue,
> .start = ath11k_mac_op_start,
> .stop = ath11k_mac_op_stop,
> .reconfig_complete = ath11k_mac_op_reconfig_complete,
> @@ -9263,6 +9319,8 @@ static int __ath11k_mac_register(struct ath11k *ar)
> ab->hw_params.bios_sar_capa)
> ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa;
>
> + wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL);
> +
> ret = ieee80211_register_hw(ar->hw);
> if (ret) {
> ath11k_err(ar->ab, "ieee80211 registration failed: %d\n", ret);
> diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h
> index 0231783ad754..15517e9a3408 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.h
> +++ b/drivers/net/wireless/ath/ath11k/mac.h
> @@ -175,4 +175,5 @@ int ath11k_mac_wait_tx_complete(struct ath11k *ar);
> int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif,
> enum wmi_sta_keepalive_method method,
> u32 interval);
> +void ath11k_mac_tx_push_pending(struct ath11k *ar);
> #endif
>
> base-commit: 12f167f02a1abe2c8817496a902de00758285b92
actual code change LGTM