All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Kazior <michal.kazior@tieto.com>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, Michal Kazior <michal.kazior@tieto.com>
Subject: [PATCH 3/5] ath10k: prevent invalid ps timeout config
Date: Wed, 10 Dec 2014 13:31:52 +0100	[thread overview]
Message-ID: <1418214714-29689-4-git-send-email-michal.kazior@tieto.com> (raw)
In-Reply-To: <1418214714-29689-1-git-send-email-michal.kazior@tieto.com>

Setting 0 ps timeout to firmware yields very poor
latency and traffic issues. This is the case when
multi-vif is active.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 969d187..d41e3d5 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1079,10 +1079,12 @@ static int ath10k_mac_vif_recalc_ps_wake_threshold(struct ath10k_vif *arvif)
 static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
 {
 	struct ath10k *ar = arvif->ar;
+	struct ieee80211_vif *vif = arvif->vif;
 	struct ieee80211_conf *conf = &ar->hw->conf;
 	enum wmi_sta_powersave_param param;
 	enum wmi_sta_ps_mode psmode;
 	int ret;
+	int ps_timeout;
 
 	lockdep_assert_held(&arvif->ar->conf_mutex);
 
@@ -1093,8 +1095,15 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
 		psmode = WMI_STA_PS_MODE_ENABLED;
 		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;
 
+		ps_timeout = conf->dynamic_ps_timeout;
+		if (ps_timeout == 0) {
+			/* Firmware doesn't like 0 */
+			ps_timeout = ieee80211_tu_to_usec(
+				vif->bss_conf.beacon_int) / 1000;
+		}
+
 		ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
-						  conf->dynamic_ps_timeout);
+						  ps_timeout);
 		if (ret) {
 			ath10k_warn(ar, "failed to set inactivity time for vdev %d: %i\n",
 				    arvif->vdev_id, ret);
-- 
1.8.5.3


WARNING: multiple messages have this Message-ID (diff)
From: Michal Kazior <michal.kazior@tieto.com>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, Michal Kazior <michal.kazior@tieto.com>
Subject: [PATCH 3/5] ath10k: prevent invalid ps timeout config
Date: Wed, 10 Dec 2014 13:31:52 +0100	[thread overview]
Message-ID: <1418214714-29689-4-git-send-email-michal.kazior@tieto.com> (raw)
In-Reply-To: <1418214714-29689-1-git-send-email-michal.kazior@tieto.com>

Setting 0 ps timeout to firmware yields very poor
latency and traffic issues. This is the case when
multi-vif is active.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 969d187..d41e3d5 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1079,10 +1079,12 @@ static int ath10k_mac_vif_recalc_ps_wake_threshold(struct ath10k_vif *arvif)
 static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
 {
 	struct ath10k *ar = arvif->ar;
+	struct ieee80211_vif *vif = arvif->vif;
 	struct ieee80211_conf *conf = &ar->hw->conf;
 	enum wmi_sta_powersave_param param;
 	enum wmi_sta_ps_mode psmode;
 	int ret;
+	int ps_timeout;
 
 	lockdep_assert_held(&arvif->ar->conf_mutex);
 
@@ -1093,8 +1095,15 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif)
 		psmode = WMI_STA_PS_MODE_ENABLED;
 		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;
 
+		ps_timeout = conf->dynamic_ps_timeout;
+		if (ps_timeout == 0) {
+			/* Firmware doesn't like 0 */
+			ps_timeout = ieee80211_tu_to_usec(
+				vif->bss_conf.beacon_int) / 1000;
+		}
+
 		ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
-						  conf->dynamic_ps_timeout);
+						  ps_timeout);
 		if (ret) {
 			ath10k_warn(ar, "failed to set inactivity time for vdev %d: %i\n",
 				    arvif->vdev_id, ret);
-- 
1.8.5.3


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  parent reply	other threads:[~2014-12-10 12:44 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-10 12:31 [PATCH 0/5] ath10k: a bunch of STA-related fixes Michal Kazior
2014-12-10 12:31 ` Michal Kazior
2014-12-10 12:31 ` [PATCH 1/5] ath10k: improve 11b coex Michal Kazior
2014-12-10 12:31   ` Michal Kazior
2014-12-10 12:31 ` [PATCH 2/5] ath10k: fix STA u-APSD Michal Kazior
2014-12-10 12:31   ` Michal Kazior
2014-12-11  9:56   ` Michal Kazior
2014-12-11  9:56     ` Michal Kazior
2014-12-10 12:31 ` Michal Kazior [this message]
2014-12-10 12:31   ` [PATCH 3/5] ath10k: prevent invalid ps timeout config Michal Kazior
2014-12-10 12:31 ` [PATCH 4/5] ath10k: enable per-vif sta powersave Michal Kazior
2014-12-10 12:31   ` Michal Kazior
2014-12-10 12:31 ` [PATCH 5/5] ath10k: advertise p2p dev support Michal Kazior
2014-12-10 12:31   ` Michal Kazior
2014-12-12 11:41 ` [PATCH v2 0/5] ath10k: a bunch of STA-related fixes Michal Kazior
2014-12-12 11:41   ` Michal Kazior
2014-12-12 11:41   ` [PATCH v2 1/5] ath10k: improve 11b coex Michal Kazior
2014-12-12 11:41     ` Michal Kazior
2014-12-12 11:41   ` [PATCH v2 2/5] ath10k: fix STA u-APSD Michal Kazior
2014-12-12 11:41     ` Michal Kazior
2014-12-12 11:41   ` [PATCH v2 3/5] ath10k: prevent invalid ps timeout config Michal Kazior
2014-12-12 11:41     ` Michal Kazior
2014-12-12 11:41   ` [PATCH v2 4/5] ath10k: enable per-vif sta powersave Michal Kazior
2014-12-12 11:41     ` Michal Kazior
2014-12-12 11:41   ` [PATCH v2 5/5] ath10k: advertise p2p dev support Michal Kazior
2014-12-12 11:41     ` Michal Kazior
2014-12-16  7:27   ` [PATCH v2 0/5] ath10k: a bunch of STA-related fixes Kalle Valo
2014-12-16  7:27     ` Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1418214714-29689-4-git-send-email-michal.kazior@tieto.com \
    --to=michal.kazior@tieto.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.