ath10k: fix STA u-APSD

To comply with WMM-PS the device shouldn't wake up
with a NullFunc frame pair when tx-ing. Instead PM
bit on each tx frame should be used.

To make this work correctly firmware needs to be
told to use a different STA PS wake threshold when
u-APSD is enabled.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 950322d646a5701d6d3fc1c7320ced61581f3bf0..13c2bad71c21a297d3d923b0be3b92306da3a63a 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1048,6 +1048,57 @@ static void ath10k_control_ibss(struct ath10k_vif *arvif,
                            arvif->vdev_id, ret);
 }
 
+static int ath10k_mac_vif_recalc_ps_wake_threshold(struct ath10k_vif *arvif)
+{
+       struct ath10k *ar = arvif->ar;
+       u32 param;
+       u32 value;
+       int ret;
+
+       lockdep_assert_held(&arvif->ar->conf_mutex);
+
+       if (arvif->u.sta.uapsd)
+               value = WMI_STA_PS_TX_WAKE_THRESHOLD_NEVER;
+       else
+               value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS;
+
+       param = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD;
+       ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param, value);
+       if (ret) {
+               ath10k_warn(ar, "failed to submit ps wake threshold %u on vdev %i: %d\n",
+                           value, arvif->vdev_id, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int ath10k_mac_vif_recalc_ps_poll_count(struct ath10k_vif *arvif)
+{
+       struct ath10k *ar = arvif->ar;
+       u32 param;
+       u32 value;
+       int ret;
+
+       lockdep_assert_held(&arvif->ar->conf_mutex);
+
+       if (arvif->u.sta.uapsd)
+               value = WMI_STA_PS_PSPOLL_COUNT_UAPSD;
+       else
+               value = WMI_STA_PS_PSPOLL_COUNT_NO_MAX;
+
+       param = WMI_STA_PS_PARAM_PSPOLL_COUNT;
+       ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id,
+                                         param, value);
+       if (ret) {
+               ath10k_warn(ar, "failed to submit ps poll count %u on vdev %i: %d\n",
+                           value, arvif->vdev_id, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
 /*
  * Review this when mac80211 gains per-interface powersave support.
  */
@@ -3036,22 +3087,16 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
                        goto err_peer_delete;
                }
 
-               param = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD;
-               value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS;
-               ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id,
-                                                 param, value);
+               ret = ath10k_mac_vif_recalc_ps_wake_threshold(arvif);
                if (ret) {
-                       ath10k_warn(ar, "failed to set vdev %i TX wake thresh: %d\n",
+                       ath10k_warn(ar, "failed to recalc ps wake threshold on vdev %i: %d\n",
                                    arvif->vdev_id, ret);
                        goto err_peer_delete;
                }
 
-               param = WMI_STA_PS_PARAM_PSPOLL_COUNT;
-               value = WMI_STA_PS_PSPOLL_COUNT_NO_MAX;
-               ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id,
-                                                 param, value);
+               ret = ath10k_mac_vif_recalc_ps_poll_count(arvif);
                if (ret) {
-                       ath10k_warn(ar, "failed to set vdev %i PSPOLL count: %d\n",
+                       ath10k_warn(ar, "failed to recalc ps poll count on vdev %i: %d\n",
                                    arvif->vdev_id, ret);
                        goto err_peer_delete;
                }
@@ -3818,6 +3863,20 @@ static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif,
        if (ret)
                ath10k_warn(ar, "failed to set rx wake param: %d\n", ret);
 
+       ret = ath10k_mac_vif_recalc_ps_wake_threshold(arvif);
+       if (ret) {
+               ath10k_warn(ar, "failed to recalc ps wake threshold on vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               return ret;
+       }
+
+       ret = ath10k_mac_vif_recalc_ps_poll_count(arvif);
+       if (ret) {
+               ath10k_warn(ar, "failed to recalc ps poll count on vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               return ret;
+       }
+
 exit:
        return ret;
 }

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 97f902f03ec5c02a50332c8aeb4527b10605c26f..ff2d0765cbb231f70ade0c2fbed58fc8acae69a6 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -4015,6 +4015,13 @@ enum wmi_sta_ps_param_pspoll_count {
         * Values greater than 0 indicate the maximum numer of PS-Poll frames
         * FW will send before waking up.
         */
+
+       /* When u-APSD is enabled the firmware will be very reluctant to exit
+        * STA PS. This could result in very poor Rx performance with STA doing
+        * PS-Poll for each and every buffered frame. This value is a bit
+        * arbitrary.
+        */
+       WMI_STA_PS_PSPOLL_COUNT_UAPSD = 3,
 };
 
 /*