wifi: mt76: mt7996: Add mt7996_sta_link struct in mt7996_vif_link

Introduce mt7996_sta_link field in mt7996_vif_link structure instead of
mt7996_sta. This is a preliminary patch to support MLO in MT7996 driver.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250311-mt7996-mlo-v2-3-31df6972519b@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 754f8e520f52f6abf70daa148bf4289f68b1252b..456666eb7080c50493dcde61c5399adc6a987d2d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -72,10 +72,10 @@ static struct mt76_wcid *mt7996_rx_get_wcid(struct mt7996_dev *dev,
        msta_link = container_of(wcid, struct mt7996_sta_link, wcid);
        msta = msta_link->sta;
 
-       if (!msta->vif)
+       if (!msta || !msta->vif)
                return NULL;
 
-       return &msta->vif->deflink.sta.deflink.wcid;
+       return &msta->vif->deflink.msta_link.wcid;
 }
 
 bool mt7996_mac_wtbl_update(struct mt7996_dev *dev, int idx, u32 mask)
@@ -202,7 +202,7 @@ void mt7996_mac_enable_rtscts(struct mt7996_dev *dev,
                              struct ieee80211_vif *vif, bool enable)
 {
        struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
-       struct mt7996_sta_link *msta_link = &mvif->deflink.sta.deflink;
+       struct mt7996_sta_link *msta_link = &mvif->deflink.msta_link;
        u32 addr;
 
        addr = mt7996_mac_wtbl_lmac_addr(dev, msta_link->wcid.idx, 5);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 0cd011619fd3fc6f6994e4a8a896668340969cf5..34f984387c00714fbe72af5220ec067760510bb8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -161,19 +161,23 @@ mt7996_set_hw_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                  struct mt7996_vif_link *mlink, struct ieee80211_key_conf *key)
 {
        struct mt7996_dev *dev = mt7996_hw_dev(hw);
-       struct mt7996_sta *msta = sta ? (struct mt7996_sta *)sta->drv_priv :
-                                 &mlink->sta;
-       struct mt76_wcid *wcid = &msta->deflink.wcid;
-       u8 *wcid_keyidx = &wcid->hw_key_idx;
+       struct mt76_wcid *wcid = &mlink->msta_link.wcid;
        struct mt7996_phy *phy;
        int idx = key->keyidx;
+       u8 *wcid_keyidx;
 
        phy = mt7996_vif_link_phy(mlink);
        if (!phy)
                return -EINVAL;
 
-       if (sta && !wcid->sta)
-               return -EOPNOTSUPP;
+       if (sta) {
+               struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
+
+               wcid = &msta->deflink.wcid;
+               if (!wcid->sta)
+                       return -EOPNOTSUPP;
+       }
+       wcid_keyidx = &wcid->hw_key_idx;
 
        switch (key->cipher) {
        case WLAN_CIPHER_SUITE_AES_CMAC:
@@ -229,7 +233,7 @@ int mt7996_vif_link_add(struct mt76_phy *mphy, struct ieee80211_vif *vif,
                        struct mt76_vif_link *mlink)
 {
        struct mt7996_vif_link *link = container_of(mlink, struct mt7996_vif_link, mt76);
-       struct mt7996_sta_link *msta_link = &link->sta.deflink;
+       struct mt7996_sta_link *msta_link = &link->msta_link;
        struct mt7996_phy *phy = mphy->priv;
        struct mt7996_dev *dev = phy->dev;
        u8 band_idx = phy->mt76->band_idx;
@@ -261,7 +265,6 @@ int mt7996_vif_link_add(struct mt76_phy *mphy, struct ieee80211_vif *vif,
        idx = MT7996_WTBL_RESERVED - mlink->idx;
 
        INIT_LIST_HEAD(&msta_link->rc_list);
-       msta_link->sta = &link->sta;
        msta_link->wcid.idx = idx;
        msta_link->wcid.tx_info |= MT_WCID_TX_INFO_SET;
        mt76_wcid_init(&msta_link->wcid, band_idx);
@@ -303,10 +306,9 @@ void mt7996_vif_link_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif,
                            struct mt76_vif_link *mlink)
 {
        struct mt7996_vif_link *link = container_of(mlink, struct mt7996_vif_link, mt76);
+       struct mt7996_sta_link *msta_link = &link->msta_link;
        struct mt7996_phy *phy = mphy->priv;
        struct mt7996_dev *dev = phy->dev;
-       struct mt7996_sta *msta = &link->sta;
-       struct mt7996_sta_link *msta_link = &msta->deflink;
        int idx = msta_link->wcid.idx;
 
        mt7996_mcu_add_sta(dev, vif, mlink, NULL, CONN_STATE_DISCONNECT, false);
@@ -892,7 +894,7 @@ static void mt7996_tx(struct ieee80211_hw *hw,
                struct mt7996_vif *mvif;
 
                mvif = (struct mt7996_vif *)vif->drv_priv;
-               wcid = &mvif->deflink.sta.deflink.wcid;
+               wcid = &mvif->deflink.msta_link.wcid;
 
                if (mvif->mt76.roc_phy &&
                    (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index b0ddc2af1516995fc11f030ef8360bae4ea3be3b..9018ede6efed49241205ddc042f3df149cd58530 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -2171,8 +2171,8 @@ mt7996_mcu_add_group(struct mt7996_dev *dev, struct ieee80211_vif *vif,
                .val = cpu_to_le32(mvif->deflink.mt76.idx % 16),
        };
 
-       msta = sta ? (struct mt7996_sta *)sta->drv_priv : &mvif->deflink.sta;
-       msta_link = &msta->deflink;
+       msta = sta ? (struct mt7996_sta *)sta->drv_priv : NULL;
+       msta_link = msta ? &msta->deflink : &mvif->deflink.msta_link;
        req.wlan_idx = cpu_to_le16(msta_link->wcid.idx);
 
        return mt76_mcu_send_msg(&dev->mt76, MCU_WM_UNI_CMD(VOW), &req,
@@ -2319,7 +2319,7 @@ static int mt7996_mcu_get_pn(struct mt7996_dev *dev, struct ieee80211_vif *vif,
 {
 #define TSC_TYPE_BIGTK_PN 2
        struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
-       struct mt7996_sta_link *msta_link = &mvif->deflink.sta.deflink;
+       struct mt7996_sta_link *msta_link = &mvif->deflink.msta_link;
        struct sta_rec_pn_info *pn_info;
        struct sk_buff *skb, *rskb;
        struct tlv *tlv;
@@ -4357,8 +4357,8 @@ int mt7996_mcu_wtbl_update_hdr_trans(struct mt7996_dev *dev,
        struct mt7996_sta *msta;
        struct sk_buff *skb;
 
-       msta = sta ? (struct mt7996_sta *)sta->drv_priv : &mvif->deflink.sta;
-       msta_link = &msta->deflink;
+       msta = sta ? (struct mt7996_sta *)sta->drv_priv : NULL;
+       msta_link = msta ? &msta->deflink : &mvif->deflink.msta_link;
 
        skb = __mt76_connac_mcu_alloc_sta_req(&dev->mt76, &mvif->deflink.mt76,
                                              &msta_link->wcid,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index d0a4240f12a482895659e3a359daadcdca7bf7c9..ac5b94e1315ec610f5182563e3fb9d504a67c16f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -215,7 +215,7 @@ struct mt7996_sta {
 struct mt7996_vif_link {
        struct mt76_vif_link mt76; /* must be first */
 
-       struct mt7996_sta sta;
+       struct mt7996_sta_link msta_link;
        struct mt7996_phy *phy;
 
        struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];