wifi: mt76: mt7996: rework mt7996_set_hw_key to support MLO

Modify mt7996_set_hw_key routine to work in a multi-link setup.
This is a preliminary patch to enable MLO for MT7996 driver

Co-developed-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Co-developed-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250312-b4-mt7996-mlo-p2-v1-9-015b3d6fd928@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 4abbe761b732f1ea7791ba1f86c2c87db1eea91d..a845c3e758adcc4802f704a99ac39aa9ca670c88 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -158,62 +158,101 @@ mt7996_init_bitrate_mask(struct ieee80211_vif *vif, struct mt7996_vif_link *mlin
 static int
 mt7996_set_hw_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                  struct ieee80211_vif *vif, struct ieee80211_sta *sta,
-                 struct mt7996_vif_link *mlink, struct ieee80211_key_conf *key)
+                 struct ieee80211_key_conf *key)
 {
        struct mt7996_dev *dev = mt7996_hw_dev(hw);
-       struct mt76_wcid *wcid = &mlink->msta_link.wcid;
-       struct mt7996_phy *phy;
        int idx = key->keyidx;
-       u8 *wcid_keyidx;
+       unsigned int link_id;
+       unsigned long links;
+
+       if (key->link_id >= 0)
+               links = BIT(key->link_id);
+       else if (sta && sta->valid_links)
+               links = sta->valid_links;
+       else if (vif->valid_links)
+               links = vif->valid_links;
+       else
+               links = BIT(0);
 
-       phy = mt7996_vif_link_phy(mlink);
-       if (!phy)
-               return -EINVAL;
+       for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) {
+               struct mt7996_sta_link *msta_link;
+               struct mt7996_vif_link *link;
+               u8 *wcid_keyidx;
+               int err;
 
-       if (sta) {
-               struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
+               link = mt7996_vif_link(dev, vif, link_id);
+               if (!link)
+                       continue;
 
-               wcid = &msta->deflink.wcid;
-               if (!wcid->sta)
-                       return -EOPNOTSUPP;
-       }
-       wcid_keyidx = &wcid->hw_key_idx;
+               if (sta) {
+                       struct mt7996_sta *msta;
 
-       switch (key->cipher) {
-       case WLAN_CIPHER_SUITE_AES_CMAC:
-       case WLAN_CIPHER_SUITE_BIP_CMAC_256:
-       case WLAN_CIPHER_SUITE_BIP_GMAC_128:
-       case WLAN_CIPHER_SUITE_BIP_GMAC_256:
-               if (key->keyidx == 6 || key->keyidx == 7) {
-                       wcid_keyidx = &wcid->hw_key_idx2;
-                       key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIE;
+                       msta = (struct mt7996_sta *)sta->drv_priv;
+                       msta_link = mt76_dereference(msta->link[link_id],
+                                                    &dev->mt76);
+                       if (!msta_link)
+                               continue;
+
+                       if (!msta_link->wcid.sta)
+                               return -EOPNOTSUPP;
+               } else {
+                       msta_link = &link->msta_link;
+               }
+               wcid_keyidx = &msta_link->wcid.hw_key_idx;
+
+               switch (key->cipher) {
+               case WLAN_CIPHER_SUITE_AES_CMAC:
+               case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+               case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+               case WLAN_CIPHER_SUITE_BIP_GMAC_256:
+                       if (key->keyidx == 6 || key->keyidx == 7) {
+                               wcid_keyidx = &msta_link->wcid.hw_key_idx2;
+                               key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIE;
+                       }
+                       break;
+               default:
+                       break;
                }
-               break;
-       default:
-               break;
-       }
 
-       if (cmd == SET_KEY && !sta && !mlink->mt76.cipher) {
-               mlink->mt76.cipher = mt76_connac_mcu_get_cipher(key->cipher);
-               mt7996_mcu_add_bss_info(phy, vif, &vif->bss_conf, &mlink->mt76,
-                                       &mlink->msta_link, true);
-       }
+               if (cmd == SET_KEY && !sta && !link->mt76.cipher) {
+                       struct ieee80211_bss_conf *link_conf;
 
-       if (cmd == SET_KEY) {
-               *wcid_keyidx = idx;
-       } else {
-               if (idx == *wcid_keyidx)
-                       *wcid_keyidx = -1;
-               return 0;
-       }
+                       link_conf = link_conf_dereference_protected(vif,
+                                                                   link_id);
+                       if (!link_conf)
+                               link_conf = &vif->bss_conf;
 
-       mt76_wcid_key_setup(&dev->mt76, wcid, key);
+                       link->mt76.cipher =
+                               mt76_connac_mcu_get_cipher(key->cipher);
+                       mt7996_mcu_add_bss_info(link->phy, vif, link_conf,
+                                               &link->mt76, msta_link, true);
+               }
 
-       if (key->keyidx == 6 || key->keyidx == 7)
-               return mt7996_mcu_bcn_prot_enable(dev, vif, key);
+               if (cmd == SET_KEY) {
+                       *wcid_keyidx = idx;
+               } else {
+                       if (idx == *wcid_keyidx)
+                               *wcid_keyidx = -1;
+                       continue;
+               }
 
-       return mt7996_mcu_add_key(&dev->mt76, vif, key,
-                                 MCU_WMWA_UNI_CMD(STA_REC_UPDATE), wcid, cmd);
+               mt76_wcid_key_setup(&dev->mt76, &msta_link->wcid, key);
+
+               if (key->keyidx == 6 || key->keyidx == 7) {
+                       err = mt7996_mcu_bcn_prot_enable(dev, link,
+                                                        msta_link, key);
+                       if (err)
+                               return err;
+               }
+
+               err = mt7996_mcu_add_key(&dev->mt76, vif, key,
+                                        MCU_WMWA_UNI_CMD(STA_REC_UPDATE),
+                                        &msta_link->wcid, cmd);
+               if (err)
+                       return err;
+       }
+
+       return 0;
 }
 
 static void
@@ -221,12 +260,10 @@ mt7996_key_iter(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                struct ieee80211_sta *sta, struct ieee80211_key_conf *key,
                void *data)
 {
-       struct mt7996_vif_link *mlink = data;
-
        if (sta)
                return;
 
-       WARN_ON(mt7996_set_hw_key(hw, SET_KEY, vif, NULL, mlink, key));
+       WARN_ON(mt7996_set_hw_key(hw, SET_KEY, vif, NULL, key));
 }
 
 int mt7996_vif_link_add(struct mt76_phy *mphy, struct ieee80211_vif *vif,
@@ -298,7 +335,7 @@ int mt7996_vif_link_add(struct mt76_phy *mphy, struct ieee80211_vif *vif,
                                   CONN_STATE_PORT_SECURE, true);
        rcu_assign_pointer(dev->mt76.wcid[idx], &msta_link->wcid);
 
-       ieee80211_iter_keys(mphy->hw, vif, mt7996_key_iter, link);
+       ieee80211_iter_keys(mphy->hw, vif, mt7996_key_iter, NULL);
 
        return 0;
 }
@@ -486,7 +523,6 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 {
        struct mt7996_dev *dev = mt7996_hw_dev(hw);
        struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
-       struct mt7996_vif_link *mlink = &mvif->deflink;
        int err;
 
        /* The hardware does not support per-STA RX GTK, fallback
@@ -521,11 +557,11 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                return -EOPNOTSUPP;
        }
 
-       if (!mt7996_vif_link_phy(mlink))
-           return 0; /* defer until after link add */
+       if (!mt7996_vif_link_phy(&mvif->deflink))
+               return 0; /* defer until after link add */
 
        mutex_lock(&dev->mt76.mutex);
-       err = mt7996_set_hw_key(hw, cmd, vif, sta, mlink, key);
+       err = mt7996_set_hw_key(hw, cmd, vif, sta, key);
        mutex_unlock(&dev->mt76.mutex);
 
        return err;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 2520feba1607db1b2a87864b4d8e7b8508ac246c..2404569018a0370c967be2b074fa1b1938f33bfb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -2430,18 +2430,17 @@ int mt7996_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
        return mt76_mcu_skb_send_msg(dev, skb, mcu_cmd, true);
 }
 
-static int mt7996_mcu_get_pn(struct mt7996_dev *dev, struct ieee80211_vif *vif,
-                            u8 *pn)
+static int mt7996_mcu_get_pn(struct mt7996_dev *dev,
+                            struct mt7996_vif_link *link,
+                            struct mt7996_sta_link *msta_link, u8 *pn)
 {
 #define TSC_TYPE_BIGTK_PN 2
-       struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
-       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;
        int ret;
 
-       skb = mt76_connac_mcu_alloc_sta_req(&dev->mt76, &mvif->deflink.mt76,
+       skb = mt76_connac_mcu_alloc_sta_req(&dev->mt76, &link->mt76,
                                            &msta_link->wcid);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
@@ -2466,10 +2465,11 @@ static int mt7996_mcu_get_pn(struct mt7996_dev *dev, struct ieee80211_vif *vif,
        return 0;
 }
 
-int mt7996_mcu_bcn_prot_enable(struct mt7996_dev *dev, struct ieee80211_vif *vif,
+int mt7996_mcu_bcn_prot_enable(struct mt7996_dev *dev,
+                              struct mt7996_vif_link *link,
+                              struct mt7996_sta_link *msta_link,
                               struct ieee80211_key_conf *key)
 {
-       struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
        struct mt7996_mcu_bcn_prot_tlv *bcn_prot;
        struct sk_buff *skb;
        struct tlv *tlv;
@@ -2478,7 +2478,7 @@ int mt7996_mcu_bcn_prot_enable(struct mt7996_dev *dev, struct ieee80211_vif *vif
                  sizeof(struct mt7996_mcu_bcn_prot_tlv);
        int ret;
 
-       skb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &mvif->deflink.mt76, len);
+       skb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &link->mt76, len);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
@@ -2486,7 +2486,7 @@ int mt7996_mcu_bcn_prot_enable(struct mt7996_dev *dev, struct ieee80211_vif *vif
 
        bcn_prot = (struct mt7996_mcu_bcn_prot_tlv *)tlv;
 
-       ret = mt7996_mcu_get_pn(dev, vif, pn);
+       ret = mt7996_mcu_get_pn(dev, link, msta_link, pn);
        if (ret) {
                dev_kfree_skb(skb);
                return ret;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 4d5ab3f4b78ee6fc584370372fe34b44292e4594..1e79757b7a5197426438532a2f0c39e54d6ebae5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -746,7 +746,9 @@ bool mt7996_debugfs_rx_log(struct mt7996_dev *dev, const void *data, int len);
 int mt7996_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
                       struct ieee80211_key_conf *key, int mcu_cmd,
                       struct mt76_wcid *wcid, enum set_key_cmd cmd);
-int mt7996_mcu_bcn_prot_enable(struct mt7996_dev *dev, struct ieee80211_vif *vif,
+int mt7996_mcu_bcn_prot_enable(struct mt7996_dev *dev,
+                              struct mt7996_vif_link *link,
+                              struct mt7996_sta_link *msta_link,
                               struct ieee80211_key_conf *key);
 int mt7996_mcu_wtbl_update_hdr_trans(struct mt7996_dev *dev,
                                     struct ieee80211_vif *vif,