| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7d389aa2-5e5d-4b0c-8603-60bbcbce7015@oss.qualcomm.com>
Date: Wed, 29 Oct 2025 13:50:22 +0800
From: Baochen Qiang <baochen.qiang@....qualcomm.com>
To: Miaoqing Pan <miaoqing.pan@....qualcomm.com>, jjohnson@...nel.org
Cc: ath12k@...ts.infradead.org, linux-wireless@...r.kernel.org,
linux-kernel@...r.kernel.org, Ross Brown <true.robot.ross@...il.com>
Subject: Re: [PATCH ath-current] Revert "wifi: ath12k: Fix missing station
power save configuration"
On 10/28/2025 2:07 PM, Miaoqing Pan wrote:
> This reverts commit 4b66d18918f8e4d85e51974a9e3ce9abad5c7c3d.
>
> In [1], Ross Brown reports poor performance of WCN7850 after enabling
> power save. Temporarily revert the fix; it will be re-enabled once
> the issue is resolved.
>
> Tested-on: WCN7850 hw2.0 PCI WLAN.IOE_HMT.1.1-00011-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
>
> Fixes: 4b66d18918f8 ("wifi: ath12k: Fix missing station power save configuration")
> Reported-by: Ross Brown <true.robot.ross@...il.com>
> Closes: https://lore.kernel.org/all/CAMn66qZENLhDOcVJuwUZ3ir89PVtVnQRq9DkV5xjJn1p6BKB9w@mail.gmail.com/ # [1]
> Signed-off-by: Miaoqing Pan <miaoqing.pan@....qualcomm.com>
> ---
> drivers/net/wireless/ath/ath12k/mac.c | 122 ++++++++++++--------------
> 1 file changed, 55 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
> index eacab798630a..db351c922018 100644
> --- a/drivers/net/wireless/ath/ath12k/mac.c
> +++ b/drivers/net/wireless/ath/ath12k/mac.c
> @@ -4064,68 +4064,12 @@ static int ath12k_mac_fils_discovery(struct ath12k_link_vif *arvif,
> return ret;
> }
>
> -static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)
> -{
> - struct ath12k *ar = arvif->ar;
> - struct ieee80211_vif *vif = arvif->ahvif->vif;
> - struct ieee80211_conf *conf = &ath12k_ar_to_hw(ar)->conf;
> - enum wmi_sta_powersave_param param;
> - struct ieee80211_bss_conf *info;
> - enum wmi_sta_ps_mode psmode;
> - int ret;
> - int timeout;
> - bool enable_ps;
> -
> - lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
> -
> - if (vif->type != NL80211_IFTYPE_STATION)
> - return;
> -
> - enable_ps = arvif->ahvif->ps;
> - if (enable_ps) {
> - psmode = WMI_STA_PS_MODE_ENABLED;
> - param = WMI_STA_PS_PARAM_INACTIVITY_TIME;
> -
> - timeout = conf->dynamic_ps_timeout;
> - if (timeout == 0) {
> - info = ath12k_mac_get_link_bss_conf(arvif);
> - if (!info) {
> - ath12k_warn(ar->ab, "unable to access bss link conf in setup ps for vif %pM link %u\n",
> - vif->addr, arvif->link_id);
> - return;
> - }
> -
> - /* firmware doesn't like 0 */
> - timeout = ieee80211_tu_to_usec(info->beacon_int) / 1000;
> - }
> -
> - ret = ath12k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
> - timeout);
> - if (ret) {
> - ath12k_warn(ar->ab, "failed to set inactivity time for vdev %d: %i\n",
> - arvif->vdev_id, ret);
> - return;
> - }
> - } else {
> - psmode = WMI_STA_PS_MODE_DISABLED;
> - }
> -
> - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %d psmode %s\n",
> - arvif->vdev_id, psmode ? "enable" : "disable");
> -
> - ret = ath12k_wmi_pdev_set_ps_mode(ar, arvif->vdev_id, psmode);
> - if (ret)
> - ath12k_warn(ar->ab, "failed to set sta power save mode %d for vdev %d: %d\n",
> - psmode, arvif->vdev_id, ret);
> -}
> -
> static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif,
> u64 changed)
> {
> struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
> unsigned long links = ahvif->links_map;
> - struct ieee80211_vif_cfg *vif_cfg;
> struct ieee80211_bss_conf *info;
> struct ath12k_link_vif *arvif;
> struct ieee80211_sta *sta;
> @@ -4189,24 +4133,61 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,
> }
> }
> }
> +}
>
> - if (changed & BSS_CHANGED_PS) {
> - links = ahvif->links_map;
> - vif_cfg = &vif->cfg;
> +static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)
> +{
> + struct ath12k *ar = arvif->ar;
> + struct ieee80211_vif *vif = arvif->ahvif->vif;
> + struct ieee80211_conf *conf = &ath12k_ar_to_hw(ar)->conf;
> + enum wmi_sta_powersave_param param;
> + struct ieee80211_bss_conf *info;
> + enum wmi_sta_ps_mode psmode;
> + int ret;
> + int timeout;
> + bool enable_ps;
>
> - for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) {
> - arvif = wiphy_dereference(hw->wiphy, ahvif->link[link_id]);
> - if (!arvif || !arvif->ar)
> - continue;
> + lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
>
> - ar = arvif->ar;
> + if (vif->type != NL80211_IFTYPE_STATION)
> + return;
> +
> + enable_ps = arvif->ahvif->ps;
> + if (enable_ps) {
> + psmode = WMI_STA_PS_MODE_ENABLED;
> + param = WMI_STA_PS_PARAM_INACTIVITY_TIME;
>
> - if (ar->ab->hw_params->supports_sta_ps) {
> - ahvif->ps = vif_cfg->ps;
> - ath12k_mac_vif_setup_ps(arvif);
> + timeout = conf->dynamic_ps_timeout;
> + if (timeout == 0) {
> + info = ath12k_mac_get_link_bss_conf(arvif);
> + if (!info) {
> + ath12k_warn(ar->ab, "unable to access bss link conf in setup ps for vif %pM link %u\n",
> + vif->addr, arvif->link_id);
> + return;
> }
> +
> + /* firmware doesn't like 0 */
> + timeout = ieee80211_tu_to_usec(info->beacon_int) / 1000;
> }
> +
> + ret = ath12k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
> + timeout);
> + if (ret) {
> + ath12k_warn(ar->ab, "failed to set inactivity time for vdev %d: %i\n",
> + arvif->vdev_id, ret);
> + return;
> + }
> + } else {
> + psmode = WMI_STA_PS_MODE_DISABLED;
> }
> +
> + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %d psmode %s\n",
> + arvif->vdev_id, psmode ? "enable" : "disable");
> +
> + ret = ath12k_wmi_pdev_set_ps_mode(ar, arvif->vdev_id, psmode);
> + if (ret)
> + ath12k_warn(ar->ab, "failed to set sta power save mode %d for vdev %d: %d\n",
> + psmode, arvif->vdev_id, ret);
> }
>
> static bool ath12k_mac_supports_tpc(struct ath12k *ar, struct ath12k_vif *ahvif,
> @@ -4228,6 +4209,7 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
> {
> struct ath12k_vif *ahvif = arvif->ahvif;
> struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
> + struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;
> struct cfg80211_chan_def def;
> u32 param_id, param_value;
> enum nl80211_band band;
> @@ -4514,6 +4496,12 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
> }
>
> ath12k_mac_fils_discovery(arvif, info);
> +
> + if (changed & BSS_CHANGED_PS &&
> + ar->ab->hw_params->supports_sta_ps) {
> + ahvif->ps = vif_cfg->ps;
> + ath12k_mac_vif_setup_ps(arvif);
> + }
> }
>
> static struct ath12k_vif_cache *ath12k_ahvif_get_link_cache(struct ath12k_vif *ahvif,
>
> base-commit: 2469bb6a6af944755a7d7daf66be90f3b8decbf9
Reviewed-by: Baochen Qiang <baochen.qiang@....qualcomm.com>
Powered by blists - more mailing lists