Commit ead6d411 authored by Baochen Qiang's avatar Baochen Qiang Committed by Jeff Johnson
Browse files

wifi: ath12k: make assoc link associate first 



In MLO scenario WCN7850 firmware requests the assoc link to associate
before any other links. However currently in
ath12k_mac_op_vif_cfg_changed() we are doing association in an ascending
order of link id. If the assoc link does not get assigned the smallest
id, a non-assoc link gets associated first and firmware crashes.

Change to do association for the assoc link first.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00209-QCAHKSWPL_SILICONZ-1

Signed-off-by: default avatarBaochen Qiang <quic_bqiang@quicinc.com>
Link: https://patch.msgid.link/20250409-ath12k-wcn7850-mlo-support-v2-5-3801132ca2c3@quicinc.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 0cd46d1f

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

+31 −0
Original line number Diff line number Diff line
@@ -3614,6 +3614,8 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw, 
	unsigned long links = ahvif->links_map;

	struct ieee80211_bss_conf *info;

	struct ath12k_link_vif *arvif;

	struct ieee80211_sta *sta;

	struct ath12k_sta *ahsta;

	struct ath12k *ar;

	u8 link_id;
@@ -3626,6 +3628,35 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_ASSOC) {

		if (vif->cfg.assoc) {

			/* only in station mode we can get here, so it's safe

			 * to use ap_addr

			 */

			rcu_read_lock();

			sta = ieee80211_find_sta(vif, vif->cfg.ap_addr);

			if (!sta) {

				rcu_read_unlock();

				WARN_ONCE(1, "failed to find sta with addr %pM\n",

					  vif->cfg.ap_addr);

				return;

			}



			ahsta = ath12k_sta_to_ahsta(sta);

			arvif = wiphy_dereference(hw->wiphy,

						  ahvif->link[ahsta->assoc_link_id]);

			rcu_read_unlock();



			ar = arvif->ar;

			/* there is no reason for which an assoc link's

			 * bss info does not exist

			 */

			info = ath12k_mac_get_link_bss_conf(arvif);

			ath12k_bss_assoc(ar, arvif, info);



			/* exclude assoc link as it is done above */

			links &= ~BIT(ahsta->assoc_link_id);

		}



		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)