wifi: ath12k: allocate new links in change_vif_links()

Currently, links in an interface are allocated during channel assignment
via assign_vif_chanctx(). Conversely, links are deleted during channel
unassignment via unassign_vif_chanctx(). However, deleting links during
channel unassignment does not comply with mac80211 link handling.
Therefore, this process should be managed within change_vif_links(). To
maintain symmetry, link addition should also be handled in
change_vif_links().

Hence, add changes to allocate link arvif in change_vif_links(). Creating
the link interface on firmware will still be done during channel
assignment.

And since link will be created but channel might not be assigned, there is
a need now to test is_created flag in ath12k_mac_mlo_get_vdev_args() before
accessing link_conf or else link bring up will fail.

A subsequent change will handle link removal part.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1.97421.5 # Nicolas Escande

Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Signed-off-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Tested-by: Nicolas Escande <nico.escande@gmail.com>
Link: https://patch.msgid.link/20250204-unlink_link_arvif_from_chanctx-v2-7-764fb5973c1a@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 493d3d43b121dc6b60299f1340fb74a9776cae54..156ea7a975d919c6f86102c3136c74100bb4a714 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -3601,6 +3601,31 @@ ath12k_mac_op_change_vif_links(struct ieee80211_hw *hw,
                               u16 old_links, u16 new_links,
                               struct ieee80211_bss_conf *ol[IEEE80211_MLD_MAX_NUM_LINKS])
 {
+       struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
+       unsigned long to_add = ~old_links & new_links;
+       struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
+       struct ath12k_link_vif *arvif;
+       u8 link_id;
+
+       lockdep_assert_wiphy(hw->wiphy);
+
+       ath12k_generic_dbg(ATH12K_DBG_MAC,
+                          "mac vif link changed for MLD %pM old_links 0x%x new_links 0x%x\n",
+                          vif->addr, old_links, new_links);
+
+       for_each_set_bit(link_id, &to_add, IEEE80211_MLD_MAX_NUM_LINKS) {
+               arvif = wiphy_dereference(hw->wiphy, ahvif->link[link_id]);
+               /* mac80211 wants to add link but driver already has the
+                * link. This should not happen ideally.
+                */
+               if (WARN_ON(arvif))
+                       return -EINVAL;
+
+               arvif = ath12k_mac_assign_link_vif(ah, vif, link_id);
+               if (WARN_ON(!arvif))
+                       return -EINVAL;
+       }
+
        return 0;
 }
 
@@ -8771,6 +8796,9 @@ ath12k_mac_mlo_get_vdev_args(struct ath12k_link_vif *arvif,
                if (arvif == arvif_p)
                        continue;
 
+               if (!arvif_p->is_created)
+                       continue;
+
                link_conf = wiphy_dereference(ahvif->ah->hw->wiphy,
                                              ahvif->vif->link_conf[arvif_p->link_id]);