wifi: iwlwifi: mvm: adjust internal stations to MLO

Internal stations are mcast/bcast and sniffer. They need some link
specific data like bss id/phy id. Add link_conf as a parameter.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230328104949.25b013fd30de.I7f9f5906123acae05040cceec470c9acb07b9d42@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 950f252c1a5a2c35247b4a427c8daa17bd532382..c81b92d2e8f7fb622e218530bf7f85179c7b44af 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -78,7 +78,7 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,
                if (ret)
                        goto out_remove_link;
 
-               ret = iwl_mvm_mld_add_bcast_sta(mvm, vif);
+               ret = iwl_mvm_mld_add_bcast_sta(mvm, vif, &vif->bss_conf);
                if (ret)
                        goto out_remove_link;
 
@@ -194,7 +194,9 @@ static void iwl_mvm_mld_mac_remove_interface(struct ieee80211_hw *hw,
 
        if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
                mvm->p2p_device_vif = NULL;
-               iwl_mvm_mld_rm_bcast_sta(mvm, vif);
+
+               /* P2P device uses only one link */
+               iwl_mvm_mld_rm_bcast_sta(mvm, vif, &vif->bss_conf);
                /* Link needs to be deactivated before removal */
                iwl_mvm_link_changed(mvm, vif, &vif->bss_conf,
                                     LINK_CONTEXT_MODIFY_ACTIVE, false);
@@ -255,7 +257,8 @@ static int __iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm,
        iwl_mvm_power_update_mac(mvm);
 
        if (vif->type == NL80211_IFTYPE_MONITOR) {
-               ret = iwl_mvm_mld_add_snif_sta(mvm, vif);
+               ret = iwl_mvm_mld_add_snif_sta(mvm, vif,
+                                              &vif->bss_conf);
                if (ret)
                        goto deactivate;
        }
@@ -348,14 +351,14 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,
        if (ret)
                goto out_unlock;
 
-       ret = iwl_mvm_mld_add_mcast_sta(mvm, vif);
+       ret = iwl_mvm_mld_add_mcast_sta(mvm, vif, link_conf);
        if (ret)
                goto out_unlock;
 
        /* Send the bcast station. At this stage the TBTT and DTIM time
         * events are added and applied to the scheduler
         */
-       ret = iwl_mvm_mld_add_bcast_sta(mvm, vif);
+       ret = iwl_mvm_mld_add_bcast_sta(mvm, vif, link_conf);
        if (ret)
                goto out_rm_mcast;
 
@@ -379,9 +382,9 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw,
 out_failed:
        iwl_mvm_power_update_mac(mvm);
        mvmvif->ap_ibss_active = false;
-       iwl_mvm_mld_rm_bcast_sta(mvm, vif);
+       iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf);
 out_rm_mcast:
-       iwl_mvm_mld_rm_mcast_sta(mvm, vif);
+       iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf);
 out_unlock:
        mutex_unlock(&mvm->mutex);
        return ret;
@@ -416,8 +419,8 @@ static void iwl_mvm_mld_stop_ap_ibss(struct ieee80211_hw *hw,
 
        iwl_mvm_ftm_responder_clear(mvm, vif);
 
-       iwl_mvm_mld_rm_bcast_sta(mvm, vif);
-       iwl_mvm_mld_rm_mcast_sta(mvm, vif);
+       iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf);
+       iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf);
 
        iwl_mvm_power_update_mac(mvm);
        mutex_unlock(&mvm->mutex);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 1608ac371bb017887c53973cdfff79ecbe00633e..75d4585c0b21e7e282c7a8d67695677f4edc13dc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -166,10 +166,13 @@ static int iwl_mvm_mld_add_int_sta(struct iwl_mvm *mvm,
  * and send it to the FW.
  * Note that each P2P mac should have its own broadcast station.
  */
-int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *link_conf)
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-       struct iwl_mvm_int_sta *bsta = &mvmvif->deflink.bcast_sta;
+       struct iwl_mvm_vif_link_info *mvm_link =
+               mvmvif->link[link_conf->link_id];
+       struct iwl_mvm_int_sta *bsta = &mvm_link->bcast_sta;
        static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
        const u8 *baddr = _baddr;
        unsigned int wdg_timeout =
@@ -179,7 +182,7 @@ int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        lockdep_assert_held(&mvm->mutex);
 
        if (vif->type == NL80211_IFTYPE_ADHOC)
-               baddr = vif->bss_conf.bssid;
+               baddr = link_conf->bssid;
 
        if (vif->type == NL80211_IFTYPE_AP ||
            vif->type == NL80211_IFTYPE_ADHOC) {
@@ -202,10 +205,13 @@ int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
  * and send it to the FW.
  * Note that each AP/GO mac should have its own multicast station.
  */
-int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *link_conf)
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-       struct iwl_mvm_int_sta *msta = &mvmvif->deflink.mcast_sta;
+       struct iwl_mvm_vif_link_info *mvm_link =
+               mvmvif->link[link_conf->link_id];
+       struct iwl_mvm_int_sta *msta = &mvm_link->mcast_sta;
        static const u8 _maddr[] = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00};
        const u8 *maddr = _maddr;
        unsigned int timeout = iwl_mvm_get_wd_timeout(mvm, vif, false, false);
@@ -222,9 +228,9 @@ int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         * changes in mac80211 layer.
         */
        if (vif->type == NL80211_IFTYPE_ADHOC)
-               mvmvif->deflink.cab_queue = IWL_MVM_DQA_GCAST_QUEUE;
+               mvm_link->cab_queue = IWL_MVM_DQA_GCAST_QUEUE;
 
-       return iwl_mvm_mld_add_int_sta(mvm, msta, &mvmvif->deflink.cab_queue,
+       return iwl_mvm_mld_add_int_sta(mvm, msta, &mvm_link->cab_queue,
                                       vif->type, STATION_TYPE_MCAST,
                                       mvmvif->id, maddr, 0, &timeout);
 }
@@ -232,7 +238,8 @@ int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 /* Allocate a new station entry for the sniffer station to the given vif,
  * and send it to the FW.
  */
-int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_bss_conf *link_conf)
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 
@@ -310,9 +317,11 @@ static int iwl_mvm_mld_rm_int_sta(struct iwl_mvm *mvm,
        return ret;
 }
 
-int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_bss_conf *link_conf)
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+       struct iwl_mvm_vif_link_info *link = mvmvif->link[link_conf->link_id];
        u16 *queueptr;
 
        lockdep_assert_held(&mvm->mutex);
@@ -331,22 +340,23 @@ int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                return -EINVAL;
        }
 
-       return iwl_mvm_mld_rm_int_sta(mvm, &mvmvif->deflink.bcast_sta, true,
-                                     IWL_MAX_TID_COUNT, queueptr);
+       return iwl_mvm_mld_rm_int_sta(mvm, &link->bcast_sta,
+                                     true, IWL_MAX_TID_COUNT, queueptr);
 }
 
 /* Send the FW a request to remove the station from it's internal data
  * structures, and in addition remove it from the local data structure.
  */
-int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
+int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_bss_conf *link_conf)
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+       struct iwl_mvm_vif_link_info *link = mvmvif->link[link_conf->link_id];
 
        lockdep_assert_held(&mvm->mutex);
 
-       return iwl_mvm_mld_rm_int_sta(mvm, &mvmvif->deflink.mcast_sta, true,
-                                     0,
-                                     &mvmvif->deflink.cab_queue);
+       return iwl_mvm_mld_rm_int_sta(mvm, &link->mcast_sta, true, 0,
+                                     &link->cab_queue);
 }
 
 int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
index 3a9002eeb5fb653c90ddb8d2b64bfa40c7049346..7148263dddf87f6b82575c583ea0a681cd45f1ea 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
@@ -619,13 +619,18 @@ int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw,
 
 /* New MLD STA related APIs */
 /* STA */
-int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
-int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
-int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *link_conf);
+int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_bss_conf *link_conf);
+int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *link_conf);
 int iwl_mvm_mld_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id);
-int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_bss_conf *link_conf);
 int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
-int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
+int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                            struct ieee80211_bss_conf *link_conf);
 int iwl_mvm_mld_rm_aux_sta(struct iwl_mvm *mvm);
 int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta);