wifi: mt76: mt7925: extend mt7925_mcu_bss_basic_tlv for per-link BSS

Extend mt7925_mcu_bss_basic_tlv with per-link BSS configuration.

The patch we created is a prerequisite to enable the MLO function in the
driver. It is purely a refactoring patch so the functionality should
remain unchanged.

Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20240613030241.5771-18-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 6a1afff923991fc423eea5be2f79a5b631e88ecf..457e1fa2fde1e38e5c46c5d593b70e410d361167 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -338,6 +338,7 @@ mt7925_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        mvif->phy = phy;
        mvif->bss_conf.mt76.band_idx = 0;
        mvif->bss_conf.mt76.wmm_idx = mvif->bss_conf.mt76.idx % MT76_CONNAC_MAX_WMM_SETS;
+       mvif->bss_conf.vif = mvif;
 
        if (phy->mt76->chandef.chan->band != NL80211_BAND_2GHZ)
                mvif->bss_conf.mt76.basic_rates_idx = MT792x_BASIC_RATES_TBL + 4;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 028c94d8c21f1ec61d47e98e53ab2ee0df3d63b4..18e19ffdbb7ee4630dd67cd9101a5b4ded3bae0e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2062,15 +2062,16 @@ mt7925_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,
 
 static void
 mt7925_mcu_bss_basic_tlv(struct sk_buff *skb,
-                        struct ieee80211_vif *vif,
+                        struct ieee80211_bss_conf *link_conf,
                         struct ieee80211_sta *sta,
                         struct ieee80211_chanctx_conf *ctx,
                         struct mt76_phy *phy, u16 wlan_idx,
                         bool enable)
 {
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+       struct ieee80211_vif *vif = link_conf->vif;
+       struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);
        struct mt792x_sta *msta = sta ? (struct mt792x_sta *)sta->drv_priv :
-                                 &mvif->sta;
+                                 &mconf->vif->sta;
        struct cfg80211_chan_def *chandef = ctx ? &ctx->def : &phy->chandef;
        enum nl80211_band band = chandef->chan->band;
        struct mt76_connac_bss_basic_tlv *basic_req;
@@ -2081,8 +2082,8 @@ mt7925_mcu_bss_basic_tlv(struct sk_buff *skb,
        tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_BASIC, sizeof(*basic_req));
        basic_req = (struct mt76_connac_bss_basic_tlv *)tlv;
 
-       idx = mvif->bss_conf.mt76.omac_idx > EXT_BSSID_START ? HW_BSSID_0 :
-                                                     mvif->bss_conf.mt76.omac_idx;
+       idx = mconf->mt76.omac_idx > EXT_BSSID_START ? HW_BSSID_0 :
+                                                     mconf->mt76.omac_idx;
        basic_req->hw_bss_idx = idx;
 
        basic_req->phymode_ext = mt7925_get_phy_mode_ext(phy, vif, band, sta);
@@ -2092,15 +2093,15 @@ mt7925_mcu_bss_basic_tlv(struct sk_buff *skb,
        else
                basic_req->nonht_basic_phy = cpu_to_le16(PHY_TYPE_OFDM_INDEX);
 
-       memcpy(basic_req->bssid, vif->bss_conf.bssid, ETH_ALEN);
+       memcpy(basic_req->bssid, link_conf->bssid, ETH_ALEN);
        basic_req->phymode = mt76_connac_get_phy_mode(phy, vif, band, sta);
-       basic_req->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
-       basic_req->dtim_period = vif->bss_conf.dtim_period;
+       basic_req->bcn_interval = cpu_to_le16(link_conf->beacon_int);
+       basic_req->dtim_period = link_conf->dtim_period;
        basic_req->bmc_tx_wlan_idx = cpu_to_le16(wlan_idx);
        basic_req->sta_idx = cpu_to_le16(msta->deflink.wcid.idx);
-       basic_req->omac_idx = mvif->bss_conf.mt76.omac_idx;
-       basic_req->band_idx = mvif->bss_conf.mt76.band_idx;
-       basic_req->wmm_idx = mvif->bss_conf.mt76.wmm_idx;
+       basic_req->omac_idx = mconf->mt76.omac_idx;
+       basic_req->band_idx = mconf->mt76.band_idx;
+       basic_req->wmm_idx = mconf->mt76.wmm_idx;
        basic_req->conn_state = !enable;
 
        switch (vif->type) {
@@ -2333,7 +2334,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
                return PTR_ERR(skb);
 
        /* bss_basic must be first */
-       mt7925_mcu_bss_basic_tlv(skb, link_conf->vif, sta, ctx, phy->mt76,
+       mt7925_mcu_bss_basic_tlv(skb, link_conf, sta, ctx, phy->mt76,
                                 mvif->sta.deflink.wcid.idx, enable);
        mt7925_mcu_bss_sec_tlv(skb, link_conf);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 718c6b185d99fa1663659399e1ecb9720a201f60..f36e4aeb79b2216274581581db386fe907ada3a4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -108,6 +108,7 @@ struct mt792x_chanctx {
 
 struct mt792x_bss_conf {
        struct mt76_vif mt76; /* must be first */
+       struct mt792x_vif *vif;
        struct ewma_rssi rssi;
        struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];
 };