Commit bda60596 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'ath-current-20250909' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath 



Jeff Johnson says:
==================
ath.git update for v6.17-rc6
==================

There's a firmware API alignment fix, and a fix for powersave,
both for ath12k.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents d69eb204 82e2be57

drivers/net/wireless/ath/ath12k/mac.c

+67 −55
Original line number Diff line number Diff line
@@ -4078,12 +4078,68 @@ 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;
@@ -4147,61 +4203,24 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw, 
			}

		}

	}

}



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;

	if (changed & BSS_CHANGED_PS) {

		links = ahvif->links_map;

		vif_cfg = &vif->cfg;



	enable_ps = arvif->ahvif->ps;

	if (enable_ps) {

		psmode = WMI_STA_PS_MODE_ENABLED;

		param = WMI_STA_PS_PARAM_INACTIVITY_TIME;

		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;



		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;

			}

			ar = arvif->ar;



			/* firmware doesn't like 0 */

			timeout = ieee80211_tu_to_usec(info->beacon_int) / 1000;

			if (ar->ab->hw_params->supports_sta_ps) {

				ahvif->ps = vif_cfg->ps;

				ath12k_mac_vif_setup_ps(arvif);

			}



		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,
@@ -4223,7 +4242,6 @@ 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;
@@ -4510,12 +4528,6 @@ 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,

drivers/net/wireless/ath/ath12k/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ int ath12k_wmi_mgmt_send(struct ath12k_link_vif *arvif, u32 buf_id, 
	cmd->tx_params_valid = 0;



	frame_tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd));

	frame_tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, buf_len);

	frame_tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, buf_len_aligned);



	memcpy(frame_tlv->value, frame->data, buf_len);