mt76: mt7915: fix MT_CIPHER_BIP_CMAC_128 setkey

MCU expects to set WLAN_CIPHER_SUITE_CCMP and WLAN_CIPHER_SUITE_AES_CMAC
at the same time, so adding an intermediate buffer for batch update.

Tested-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 5fdd1a6..aedb196 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1016,9 +1016,10 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,
 
 /** starec & wtbl **/
 static int
-mt7915_mcu_sta_key_tlv(struct sk_buff *skb, struct ieee80211_key_conf *key,
-                      enum set_key_cmd cmd)
+mt7915_mcu_sta_key_tlv(struct mt7915_sta *msta, struct sk_buff *skb,
+                      struct ieee80211_key_conf *key, enum set_key_cmd cmd)
 {
+       struct mt7915_sta_key_conf *bip = &msta->bip;
        struct sta_rec_sec *sec;
        struct tlv *tlv;
        u32 len = sizeof(*sec);
@@ -1038,22 +1039,23 @@ mt7915_mcu_sta_key_tlv(struct sk_buff *skb, struct ieee80211_key_conf *key,
 
                sec_key = &sec->key[0];
                sec_key->cipher_len = sizeof(*sec_key);
-               sec_key->key_id = key->keyidx;
 
                if (cipher == MT_CIPHER_BIP_CMAC_128) {
                        sec_key->cipher_id = MT_CIPHER_AES_CCMP;
+                       sec_key->key_id = bip->keyidx;
                        sec_key->key_len = 16;
-                       memcpy(sec_key->key, key->key, 16);
+                       memcpy(sec_key->key, bip->key, 16);
 
                        sec_key = &sec->key[1];
                        sec_key->cipher_id = MT_CIPHER_BIP_CMAC_128;
                        sec_key->cipher_len = sizeof(*sec_key);
                        sec_key->key_len = 16;
-                       memcpy(sec_key->key, key->key + 16, 16);
+                       memcpy(sec_key->key, key->key, 16);
 
                        sec->n_cipher = 2;
                } else {
                        sec_key->cipher_id = cipher;
+                       sec_key->key_id = key->keyidx;
                        sec_key->key_len = key->keylen;
                        memcpy(sec_key->key, key->key, key->keylen);
 
@@ -1063,6 +1065,12 @@ mt7915_mcu_sta_key_tlv(struct sk_buff *skb, struct ieee80211_key_conf *key,
                                memcpy(sec_key->key + 24, key->key + 16, 8);
                        }
 
+                       /* store key_conf for BIP batch update */
+                       if (cipher == MT_CIPHER_AES_CCMP) {
+                               memcpy(bip->key, key->key, key->keylen);
+                               bip->keyidx = key->keyidx;
+                       }
+
                        len -= sizeof(*sec_key);
                        sec->n_cipher = 1;
                }
@@ -1088,7 +1096,7 @@ int mt7915_mcu_add_key(struct mt7915_dev *dev, struct ieee80211_vif *vif,
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
-       ret = mt7915_mcu_sta_key_tlv(skb, key, cmd);
+       ret = mt7915_mcu_sta_key_tlv(msta, skb, key, cmd);
        if (ret)
                return ret;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 0339abf..e784840 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -72,6 +72,11 @@ struct mt7915_sta_stats {
        unsigned long jiffies;
 };
 
+struct mt7915_sta_key_conf {
+       s8 keyidx;
+       u8 key[16];
+};
+
 struct mt7915_sta {
        struct mt76_wcid wcid; /* must be first */
 
@@ -85,6 +90,8 @@ struct mt7915_sta {
        struct mt7915_sta_stats stats;
 
        unsigned long ampdu_state;
+
+       struct mt7915_sta_key_conf bip;
 };
 
 struct mt7915_vif {