Skip to contentSkip to conversation

ath11k: enable power save in station mode

PATCH In review Carl Huang 3 participants 5 messages Oct 11, 2021 – Oct 28, 2021 Qualcomm Atheros ATH11K wireless driver

lore
Share & tools
lore

Carl Huang

author
#0 lore raw

PATCH 1/1 ath11k: enable power save in station mode

Enable power save in station mode.

Run "iw dev wls1 set power_save off", check there is no NULL Data frame from sniffer. Run "iw dev wls1 set power_save on", check there is NULL Data frame from sniffer.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by Carl Huang <[email protected]>
---
 drivers/net/wireless/ath/ath11k/core.c |  5 ++
 drivers/net/wireless/ath/ath11k/core.h |  1 +
 drivers/net/wireless/ath/ath11k/hw.h   |  1 +
 drivers/net/wireless/ath/ath11k/mac.c  | 99 ++++++++++++++++++++++++++++++++--
 drivers/net/wireless/ath/ath11k/wmi.c  | 33 ++++++++++++
 drivers/net/wireless/ath/ath11k/wmi.h  |  3 +-
 6 files changed, 137 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +5 -0
index 6120382..7e4b5b3 100644
@@ -67,6 +67,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
 		.supports_monitor = true,
 		.supports_shadow_regs = false,
 		.idle_ps = false,
+		.protocol_ps = false,
 		.cold_boot_calib = true,
 		.supports_suspend = false,
 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

@@ -108,6 +109,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
 		.supports_monitor = true,
 		.supports_shadow_regs = false,
 		.idle_ps = false,
+		.protocol_ps = false,
 		.cold_boot_calib = true,
 		.supports_suspend = false,
 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

@@ -149,6 +151,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
 		.supports_monitor = false,
 		.supports_shadow_regs = true,
 		.idle_ps = true,
+		.protocol_ps = true,
 		.cold_boot_calib = false,
 		.supports_suspend = true,
 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

@@ -187,6 +190,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
 		.supports_monitor = true,
 		.supports_shadow_regs = false,
 		.idle_ps = false,
+		.protocol_ps = false,
 		.cold_boot_calib = false,
 		.supports_suspend = false,
 		.hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074),

@@ -227,6 +231,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
 		.supports_monitor = false,
 		.supports_shadow_regs = true,
 		.idle_ps = true,
+		.protocol_ps = true,
 		.cold_boot_calib = false,
 		.supports_suspend = true,
 		.hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),
drivers/net/wireless/ath/ath11k/core.h +1 -0
index f0a4b90..61e9684 100644
@@ -276,6 +276,7 @@ struct ath11k_vif {
 	bool is_started;
 	bool is_up;
 	bool spectral_enabled;
+	bool ps;
 	u32 aid;
 	u8 bssid[ETH_ALEN];
 	struct cfg80211_bitrate_mask bitrate_mask;
drivers/net/wireless/ath/ath11k/hw.h +1 -0
index 7a5101d..d4ad6f2 100644
@@ -167,6 +167,7 @@ struct ath11k_hw_params {
 	bool supports_monitor;
 	bool supports_shadow_regs;
 	bool idle_ps;
+	bool protocol_ps;
 	bool cold_boot_calib;
 	bool supports_suspend;
 	u32 hal_desc_sz;
drivers/net/wireless/ath/ath11k/mac.c +95 -4

113 lines not on this page · raw message

drivers/net/wireless/ath/ath11k/wmi.c +33 -0
index 27ae944..8f46864 100644
@@ -1419,6 +1419,39 @@ int ath11k_wmi_send_set_ap_ps_param_cmd(struct ath11k *ar, u8 *peer_addr,
 	return ret;
 }
 
+int ath11k_wmi_set_psmode(struct ath11k *ar, u32 vdev_id,
+			  enum wmi_sta_ps_mode psmode)
+{
+	struct ath11k_pdev_wmi *wmi = ar->wmi;
+	struct wmi_sta_powersave_mode_cmd *cmd;
+	struct sk_buff *skb;
+	int ret;
+
+	skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd));
+	if (!skb)
+		return -ENOMEM;
+
+	cmd = (struct wmi_sta_powersave_mode_cmd *)skb->data;
+	cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG,
+				     WMI_TAG_STA_POWERSAVE_MODE_CMD) |
+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+
+	cmd->vdev_id = vdev_id;
+	cmd->sta_ps_mode = psmode;
+
+	ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+		   "WMI set sta ps vdev_id %d ps %d\n",
+		   vdev_id, psmode);
+
+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_MODE_CMDID);
+	if (ret) {
+		ath11k_warn(ar->ab, "failed to send WMI_STA_POWERSAVE_PARAM_CMDID");
+		dev_kfree_skb(skb);
+	}
+
+	return ret;
+}
+
 int ath11k_wmi_set_sta_ps_param(struct ath11k *ar, u32 vdev_id,
 				u32 param, u32 param_value)
 {
drivers/net/wireless/ath/ath11k/wmi.h +2 -1
index 0730bdb..e2cce86 100644
@@ -5600,7 +5600,8 @@ int ath11k_wmi_send_peer_create_cmd(struct ath11k *ar,
 				    struct peer_create_params *param);
 int ath11k_wmi_vdev_set_param_cmd(struct ath11k *ar, u32 vdev_id,
 				  u32 param_id, u32 param_value);
-
+int ath11k_wmi_set_psmode(struct ath11k *ar, u32 vdev_id,
+			  enum wmi_sta_ps_mode psmode);
 int ath11k_wmi_set_sta_ps_param(struct ath11k *ar, u32 vdev_id,
 				u32 param, u32 param_value);
 int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 9 lines · Carl Huang

Enable power save in station mode.

Run "iw dev wls1 set power_save off", check there is no NULL Data frame from sniffer. Run "iw dev wls1 set power_save on", check there is NULL Data frame from sniffer.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by Carl Huang <[email protected]>

Fails to apply, please rebase on top of ath.git master branch.

error: patch failed: drivers/net/wireless/ath/ath11k/mac.c:883
error: drivers/net/wireless/ath/ath11k/mac.c: patch does not apply stg import: Diff does not apply cleanly

Patch set to Changes Requested.

Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#2 lore raw
Quoted 12 lines · Kalle Valo
Quoted 9 lines · Carl Huang

Enable power save in station mode.

Run "iw dev wls1 set power_save off", check there is no NULL Data frame from sniffer. Run "iw dev wls1 set power_save on", check there is NULL Data frame from sniffer.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by Carl Huang <[email protected]>
Quoted 7 lines

Fails to apply, please rebase on top of ath.git master branch.

error: patch failed: drivers/net/wireless/ath/ath11k/mac.c:883
error: drivers/net/wireless/ath/ath11k/mac.c: patch does not apply stg import: Diff does not apply cleanly

Patch set to Changes Requested.

I'll rebase the patch and submit v2.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#3 lore raw
In reply to Carl Huang
Quoted 250 lines · Carl Huang

Enable power save in station mode.

Run "iw dev wls1 set power_save off", check there is no NULL Data frame from sniffer. Run "iw dev wls1 set power_save on", check there is NULL Data frame from sniffer.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by Carl Huang <[email protected]>
---
 drivers/net/wireless/ath/ath11k/core.c |  5 ++
 drivers/net/wireless/ath/ath11k/core.h |  1 +
 drivers/net/wireless/ath/ath11k/hw.h   |  1 +
 drivers/net/wireless/ath/ath11k/mac.c  | 99 
++++++++++++++++++++++++++++++++--
 drivers/net/wireless/ath/ath11k/wmi.c  | 33 ++++++++++++
 drivers/net/wireless/ath/ath11k/wmi.h  |  3 +-
 6 files changed, 137 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +1 -0
index 6120382..7e4b5b3 100644
@@ -67,6 +67,7 @@ static const struct ath11k_hw_params 
 ath11k_hw_params[] = {
 		.supports_monitor = true,
 		.supports_shadow_regs = false,
 		.idle_ps = false,
+		.protocol_ps = false,
 		.cold_boot_calib = true,
 		.supports_suspend = false,
drivers/net/wireless/ath/ath11k/core.c +1 -0
 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

@@ -108,6 +109,7 @@ static const struct ath11k_hw_params 
 ath11k_hw_params[] = {
 		.supports_monitor = true,
 		.supports_shadow_regs = false,
 		.idle_ps = false,
+		.protocol_ps = false,
 		.cold_boot_calib = true,
 		.supports_suspend = false,
drivers/net/wireless/ath/ath11k/core.c +1 -0
 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

@@ -149,6 +151,7 @@ static const struct ath11k_hw_params 
 ath11k_hw_params[] = {
 		.supports_monitor = false,
 		.supports_shadow_regs = true,
 		.idle_ps = true,
+		.protocol_ps = true,
 		.cold_boot_calib = false,
 		.supports_suspend = true,
drivers/net/wireless/ath/ath11k/core.c +1 -0
 		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

@@ -187,6 +190,7 @@ static const struct ath11k_hw_params 
 ath11k_hw_params[] = {
 		.supports_monitor = true,
 		.supports_shadow_regs = false,
 		.idle_ps = false,
+		.protocol_ps = false,
 		.cold_boot_calib = false,
 		.supports_suspend = false,
drivers/net/wireless/ath/ath11k/core.c +1 -0
 		.hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074),

@@ -227,6 +231,7 @@ static const struct ath11k_hw_params 
 ath11k_hw_params[] = {
 		.supports_monitor = false,
 		.supports_shadow_regs = true,
 		.idle_ps = true,
+		.protocol_ps = true,
 		.cold_boot_calib = false,
 		.supports_suspend = true,
drivers/net/wireless/ath/ath11k/core.c +0 -0
 		.hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855),
drivers/net/wireless/ath/ath11k/core.h +1 -0
index f0a4b90..61e9684 100644
@@ -276,6 +276,7 @@ struct ath11k_vif {
 	bool is_started;
 	bool is_up;
 	bool spectral_enabled;
+	bool ps;
 	u32 aid;
 	u8 bssid[ETH_ALEN];
 	struct cfg80211_bitrate_mask bitrate_mask;
drivers/net/wireless/ath/ath11k/hw.h +1 -0
index 7a5101d..d4ad6f2 100644
@@ -167,6 +167,7 @@ struct ath11k_hw_params {
 	bool supports_monitor;
 	bool supports_shadow_regs;
 	bool idle_ps;
+	bool protocol_ps;
 	bool cold_boot_calib;
 	bool supports_suspend;
 	u32 hal_desc_sz;
drivers/net/wireless/ath/ath11k/mac.c +85 -4
index d02823f..a254ef3 100644
@@ -883,12 +883,93 @@ static int ath11k_monitor_vdev_up(struct ath11k
 *ar, int vdev_id)
 	return 0;
 }
 
+static int ath11k_mac_vif_setup_ps(struct ath11k_vif *arvif)
+{
+	struct ath11k *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;
+	bool enable_ps;
+
+	lockdep_assert_held(&arvif->ar->conf_mutex);
+
+	if (arvif->vif->type != NL80211_IFTYPE_STATION)
+		return 0;
+
+	enable_ps = arvif->ps;
+
+	/* need to check if multiple vdev ps setting is supported */
+
+	if (!arvif->is_started) {
+		/* mac80211 can update vif powersave state while disconnected.
+		 * Firmware doesn't behave nicely and consumes more power than
+		 * necessary if PS is disabled on a non-started vdev. Hence
+		 * force-enable PS for non-running vdevs.
+		 */
+		psmode = WMI_STA_PS_MODE_ENABLED;
+	} else if (enable_ps) {
+		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 = ath11k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
+						  ps_timeout);
+		if (ret) {
+			ath11k_warn(ar->ab, "failed to set inactivity time for vdev %d: 
 %i\n",
+				    arvif->vdev_id, ret);
+			return ret;
+		}
+	} else {
+		psmode = WMI_STA_PS_MODE_DISABLED;
+	}
+
+	ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "mac vdev %d psmode %s\n",
+		   arvif->vdev_id, psmode ? "enable" : "disable");
+	ret = ath11k_wmi_set_psmode(ar, arvif->vdev_id, psmode);
+	if (ret) {
+		ath11k_warn(ar->ab, "failed to set PS Mode %d for vdev %d: %d\n",
+			    psmode, arvif->vdev_id, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int ath11k_config_ps(struct ath11k *ar)
+{
+	struct ath11k_vif *arvif;
+	int ret = 0;
+
+	lockdep_assert_held(&ar->conf_mutex);
+
+	list_for_each_entry(arvif, &ar->arvifs, list) {
+		ret = ath11k_mac_vif_setup_ps(arvif);
+		if (ret) {
+			ath11k_warn(ar->ab, "failed to setup powersave: %d\n", ret);
+			break;
+		}
+	}
+
+	return ret;
+}
+
 static int ath11k_mac_op_config(struct ieee80211_hw *hw, u32 changed)
 {
-	/* mac80211 requires this op to be present and that's why
-	 * there's an empty function, this can be extended when
-	 * required.
-	 */
+	struct ath11k *ar = hw->priv;
+
+	mutex_lock(&ar->conf_mutex);
+	if (changed & IEEE80211_CONF_CHANGE_PS)
+		ath11k_config_ps(ar);
+	mutex_unlock(&ar->conf_mutex);
drivers/net/wireless/ath/ath11k/mac.c +10 -0
 	return 0;
 }

@@ -2610,6 +2691,16 @@ static void
 ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
 		}
 	}
 
+	if (changed & BSS_CHANGED_PS &&
+	    ar->ab->hw_params.protocol_ps) {
+		arvif->ps = vif->bss_conf.ps;
+
+		ret = ath11k_config_ps(ar);
+		if (ret)
+			ath11k_warn(ar->ab, "failed to setup ps on vdev %i: %d\n",
+				    arvif->vdev_id, ret);
+	}
+
 	if (changed & BSS_CHANGED_MCAST_RATE &&
 	    !ath11k_mac_vif_chan(arvif->vif, &def)) {
drivers/net/wireless/ath/ath11k/mac.c +0 -0
 		band = def.chan->band;
drivers/net/wireless/ath/ath11k/wmi.c +22 -0
index 27ae944..8f46864 100644
@@ -1419,6 +1419,39 @@ int ath11k_wmi_send_set_ap_ps_param_cmd(struct
 ath11k *ar, u8 *peer_addr,
 	return ret;
 }
 
+int ath11k_wmi_set_psmode(struct ath11k *ar, u32 vdev_id,
+			  enum wmi_sta_ps_mode psmode)
+{
+	struct ath11k_pdev_wmi *wmi = ar->wmi;
+	struct wmi_sta_powersave_mode_cmd *cmd;
+	struct sk_buff *skb;
+	int ret;
+
+	skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd));
+	if (!skb)
+		return -ENOMEM;
+
+	cmd = (struct wmi_sta_powersave_mode_cmd *)skb->data;
+	cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG,
+				     WMI_TAG_STA_POWERSAVE_MODE_CMD) |
+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+
+	cmd->vdev_id = vdev_id;
+	cmd->sta_ps_mode = psmode;
+
+	ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+		   "WMI set sta ps vdev_id %d ps %d\n",

drivers/net/wireless/ath/ath11k/wmi.c int ath11k_wmi_send_set_ap_ps_param_cmd(struct · line 1454

Quoted 10 lines
drivers/net/wireless/ath/ath11k/wmi.c +10 -0
+		   vdev_id, psmode);
+
+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_MODE_CMDID);
+	if (ret) {
+		ath11k_warn(ar->ab, "failed to send WMI_STA_POWERSAVE_PARAM_CMDID");
+		dev_kfree_skb(skb);
+	}
+
+	return ret;
+}

An API which does this is already present in ATH11K, you may have to take a look at ath11k_wmi_pdev_set_ps_mode() ?

Manikanta

#4 lore raw
Quoted 12 lines · [email protected] writes:
Quoted 11 lines · Carl Huang

Enable power save in station mode.

Run "iw dev wls1 set power_save off", check there is no NULL Data frame
from sniffer. Run "iw dev wls1 set power_save on", check there is NULL Data frame from sniffer.

Tested-on: QCA6390 hw2.0 PCI
WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by Carl Huang <[email protected]>

[...]

Quoted 27 lines
Quoted 27 lines
drivers/net/wireless/ath/ath11k/wmi.c +27 -0
+int ath11k_wmi_set_psmode(struct ath11k *ar, u32 vdev_id,
+			  enum wmi_sta_ps_mode psmode)
+{
+	struct ath11k_pdev_wmi *wmi = ar->wmi;
+	struct wmi_sta_powersave_mode_cmd *cmd;
+	struct sk_buff *skb;
+	int ret;
+
+	skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd));
+	if (!skb)
+		return -ENOMEM;
+
+	cmd = (struct wmi_sta_powersave_mode_cmd *)skb->data;
+	cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG,
+				     WMI_TAG_STA_POWERSAVE_MODE_CMD) |
+			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+
+	cmd->vdev_id = vdev_id;
+	cmd->sta_ps_mode = psmode;
+
+	ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+		   "WMI set sta ps vdev_id %d ps %d\n",
+		   vdev_id, psmode);
+
+	ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_MODE_CMDID);
+	if (ret) {
+		ath11k_warn(ar->ab, "failed to send WMI_STA_POWERSAVE_PARAM_CMDID");
Quoted 8 lines

drivers/net/wireless/ath/ath11k/wmi.c int ath11k_wmi_send_set_ap_ps_param_cmd(struct ath11k *ar, u8 *peer_addr, · line 1453

Quoted 5 lines
drivers/net/wireless/ath/ath11k/wmi.c +5 -0
+		dev_kfree_skb(skb);
+	}
+
+	return ret;
+}

An API which does this is already present in ATH11K, you may have to take a look at ath11k_wmi_pdev_set_ps_mode() ?

Good catch, I'll fix this in v2.

And please do trim your replies, quotes over 200 lines long make it hard to read.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches