wifi: mt76: connac: rework connac helpers

Rework connac helpers related to rate and phymode.
This is a preliminary patch to add MLO support for mt7996 chipsets.

Co-developed-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Link: https://patch.msgid.link/20250102163508.52945-21-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 445d0f0ab7795de0ce373dff4e49df593b2e8c05..f7766a9815fe075afc2090de732049d9ae9ea02a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -427,7 +427,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
                                 struct ieee80211_key_conf *key, int pid,
                                 enum mt76_txq_id qid, u32 changed);
 u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,
-                                struct ieee80211_vif *vif,
+                                struct ieee80211_bss_conf *conf,
                                 bool beacon, bool mcast);
 bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
                               __le32 *txs_data);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index 5170af3e342851c8b31f28114dd3474f5f68c2cd..6d30f4fc352660ae880b18cc85965043df60da7f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -291,28 +291,28 @@ EXPORT_SYMBOL_GPL(mt76_connac_init_tx_queues);
 })
 
 u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,
-                                struct ieee80211_vif *vif,
+                                struct ieee80211_bss_conf *conf,
                                 bool beacon, bool mcast)
 {
-       struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
+       struct mt76_vif_link *mvif = mt76_vif_conf_link(mphy->dev, conf->vif, conf);
        struct cfg80211_chan_def *chandef = mvif->ctx ?
                                            &mvif->ctx->def : &mphy->chandef;
        u8 nss = 0, mode = 0, band = chandef->chan->band;
        int rateidx = 0, mcast_rate;
        int offset = 0;
 
-       if (!vif)
+       if (!conf)
                goto legacy;
 
        if (is_mt7921(mphy->dev)) {
-               rateidx = ffs(vif->bss_conf.basic_rates) - 1;
+               rateidx = ffs(conf->basic_rates) - 1;
                goto legacy;
        }
 
        if (beacon) {
                struct cfg80211_bitrate_mask *mask;
 
-               mask = &vif->bss_conf.beacon_tx_rate;
+               mask = &conf->beacon_tx_rate;
 
                __bitrate_mask_check(he_mcs, HE_SU);
                __bitrate_mask_check(vht_mcs, VHT);
@@ -324,11 +324,11 @@ u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,
                }
        }
 
-       mcast_rate = vif->bss_conf.mcast_rate[band];
+       mcast_rate = conf->mcast_rate[band];
        if (mcast && mcast_rate > 0)
                rateidx = mcast_rate - 1;
        else
-               rateidx = ffs(vif->bss_conf.basic_rates) - 1;
+               rateidx = ffs(conf->basic_rates) - 1;
 
 legacy:
        if (band != NL80211_BAND_2GHZ)
@@ -581,7 +581,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
                bool multicast = ieee80211_is_data(hdr->frame_control) &&
                                 is_multicast_ether_addr(hdr->addr1);
-               u16 rate = mt76_connac2_mac_tx_rate_val(mphy, vif, beacon,
+               u16 rate = mt76_connac2_mac_tx_rate_val(mphy, &vif->bss_conf, beacon,
                                                        multicast);
                u32 val = MT_TXD6_FIXED_BW;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 6e52e184aa200734a222c5e100f0bd22d25549d2..e9ec9b7e0acb223762ab7dfd6f6615fce9775ee8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -1371,7 +1371,7 @@ u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
 }
 EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode);
 
-u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,
+u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_bss_conf *conf,
                                enum nl80211_band band)
 {
        const struct ieee80211_sta_eht_cap *eht_cap;
@@ -1382,9 +1382,9 @@ u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,
                mode |= PHY_MODE_AX_6G;
 
        sband = phy->hw->wiphy->bands[band];
-       eht_cap = ieee80211_get_eht_iftype_cap(sband, vif->type);
+       eht_cap = ieee80211_get_eht_iftype_cap(sband, conf->vif->type);
 
-       if (!eht_cap || !eht_cap->has_eht || !vif->bss_conf.eht_support)
+       if (!eht_cap || !eht_cap->has_eht || !conf->eht_support)
                return mode;
 
        switch (band) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 541b3c17168bf3a41713fb6ef6db07a1361fb5dd..894b27cb61853368d560584268bfab629c3b05b1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -2018,7 +2018,7 @@ mt76_connac_get_eht_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif);
 u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
                            enum nl80211_band band,
                            struct ieee80211_link_sta *sta);
-u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,
+u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_bss_conf *conf,
                                enum nl80211_band band);
 
 int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 4aec10e941780bdf8161b0d7144d30c1960dd7f4..63a083f9a45c611f40b4b35c9b4e39710183f59c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -805,7 +805,7 @@ mt7925_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        u16 rate;
        u8 i, idx, ht;
 
-       rate = mt76_connac2_mac_tx_rate_val(mphy, vif, beacon, mcast);
+       rate = mt76_connac2_mac_tx_rate_val(mphy, &vif->bss_conf, beacon, mcast);
        ht = FIELD_GET(MT_TX_RATE_MODE, rate) > MT_PHY_TYPE_OFDM;
 
        if (beacon && ht) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index ab875abfbd0ac31c148d9f0fdae754a20a53445d..1bf45888ea1eb3e3d756bd77aac89852bc3f17db 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -541,19 +541,17 @@ static void mt7996_configure_filter(struct ieee80211_hw *hw,
 }
 
 static u8
-mt7996_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+mt7996_get_rates_table(struct mt7996_phy *phy, struct ieee80211_bss_conf *conf,
                       bool beacon, bool mcast)
 {
-       struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
-       struct mt76_phy *mphy = hw->priv;
+       struct mt7996_dev *dev = phy->dev;
+       struct mt76_vif_link *mvif = mt76_vif_conf_link(&dev->mt76, conf->vif, conf);
        u16 rate;
        u8 i, idx;
 
-       rate = mt76_connac2_mac_tx_rate_val(mphy, vif, beacon, mcast);
+       rate = mt76_connac2_mac_tx_rate_val(phy->mt76, conf, beacon, mcast);
 
        if (beacon) {
-               struct mt7996_phy *phy = mphy->priv;
-
                /* odd index for driver, even index for firmware */
                idx = MT7996_BEACON_RATES_TBL + 2 * phy->mt76->band_idx;
                if (phy->beacon_rate != rate)
@@ -626,11 +624,11 @@ static void mt7996_bss_info_changed(struct ieee80211_hw *hw,
 
        if (changed & BSS_CHANGED_MCAST_RATE)
                mvif->mcast_rates_idx =
-                       mt7996_get_rates_table(hw, vif, false, true);
+                       mt7996_get_rates_table(phy, info, false, true);
 
        if (changed & BSS_CHANGED_BASIC_RATES)
                mvif->basic_rates_idx =
-                       mt7996_get_rates_table(hw, vif, false, false);
+                       mt7996_get_rates_table(phy, info, false, false);
 
        /* ensure that enable txcmd_mode after bss_info */
        if (changed & (BSS_CHANGED_QOS | BSS_CHANGED_BEACON_ENABLED))
@@ -650,7 +648,7 @@ static void mt7996_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & (BSS_CHANGED_BEACON |
                       BSS_CHANGED_BEACON_ENABLED)) {
                mvif->beacon_rates_idx =
-                       mt7996_get_rates_table(hw, vif, true, false);
+                       mt7996_get_rates_table(phy, info, true, false);
 
                mt7996_mcu_add_beacon(hw, vif, info);
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 83c079debf9a7391c3a6d9db819d0b2b84fc7f8f..ada019e44712d6c90a51d6ffbbfe87e0dc4491da 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -1039,7 +1039,7 @@ mt7996_mcu_bss_basic_tlv(struct sk_buff *skb,
        bss->dtim_period = vif->bss_conf.dtim_period;
        bss->phymode = mt76_connac_get_phy_mode(phy, vif,
                                                chandef->chan->band, NULL);
-       bss->phymode_ext = mt76_connac_get_phy_mode_ext(phy, vif,
+       bss->phymode_ext = mt76_connac_get_phy_mode_ext(phy, &vif->bss_conf,
                                                        chandef->chan->band);
 
        return 0;