mt76: mt7615: introduce mt7615_mac_wtbl_set_key routine

Add mt7615_mac_wtbl_set_key routine to configure wtbl key parameter
directly from host cpu. This is a preliminary patch to add BIP_CMAC_128
hw support. Moreover add static qualifier to mt7615_mac_get_key_info
routine

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index fb28f68486fd4f273751cfdea68567d2a41a5b9f..1904e1a0a5975dd02f870c402c32d79cf69c29e2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -592,7 +592,7 @@ void mt7615_mac_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta,
        sta->wcid.tx_info |= MT_WCID_TX_INFO_SET;
 }
 
-enum mt7615_cipher_type
+static enum mt7615_cipher_type
 mt7615_mac_get_key_info(struct ieee80211_key_conf *key,
                        u8 *key_data)
 {
@@ -626,6 +626,55 @@ mt7615_mac_get_key_info(struct ieee80211_key_conf *key,
        }
 }
 
+int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, int wcid,
+                           struct ieee80211_key_conf *key)
+{
+       enum mt7615_cipher_type cipher;
+       u8 key_data[32] = {};
+       u32 addr, w0, w1;
+       int err = 0;
+
+       spin_lock_bh(&dev->mt76.lock);
+       if (!mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000)) {
+               err = -ETIMEDOUT;
+               goto out;
+       }
+
+       cipher = mt7615_mac_get_key_info(key, key_data);
+       if (cipher == MT_CIPHER_NONE && key) {
+               err = -EOPNOTSUPP;
+               goto out;
+       }
+
+       addr = mt7615_mac_wtbl_addr(wcid);
+
+       mt76_wr_copy(dev, addr + 30 * 4, key_data, sizeof(key_data));
+
+       mt76_rmw(dev, addr + 2 * 4, MT_WTBL_W2_KEY_TYPE,
+                FIELD_PREP(MT_WTBL_W2_KEY_TYPE, cipher));
+
+       w0 = mt76_rr(dev, addr);
+       w1 = mt76_rr(dev, addr + 4);
+       w0 &= ~(MT_WTBL_W0_KEY_IDX | MT_WTBL_W0_RX_KEY_VALID);
+       if (key)
+               w0 |= FIELD_PREP(MT_WTBL_W0_KEY_IDX, key->keyidx) |
+                     MT_WTBL_W0_RX_KEY_VALID;
+       mt76_wr(dev, MT_WTBL_RICR0, w0);
+       mt76_wr(dev, MT_WTBL_RICR1, w1);
+
+       mt76_wr(dev, MT_WTBL_UPDATE,
+               FIELD_PREP(MT_WTBL_UPDATE_WLAN_IDX, wcid) |
+               MT_WTBL_UPDATE_RXINFO_UPDATE);
+
+       if (!mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000))
+               err = -ETIMEDOUT;
+
+out:
+       spin_unlock_bh(&dev->mt76.lock);
+
+       return err;
+}
+
 int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                          enum mt76_txq_id qid, struct mt76_wcid *wcid,
                          struct ieee80211_sta *sta,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
index 358ab51270f04abac1b451cdc2ec8fb300ee41af..051b540e79fdd217c080d4b02b469ad326b4871a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
@@ -317,8 +317,4 @@ enum mt7615_cipher_type {
        MT_CIPHER_GCMP_256,
 };
 
-enum mt7615_cipher_type
-mt7615_mac_get_key_info(struct ieee80211_key_conf *key,
-                       u8 *key_data);
-
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 2c702b31d55f5f7ac90b73d17f8b69b7b4e55511..17920cb698741df29cbe0a9c9fc40528f4cbaa55 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -204,7 +204,7 @@ static int mt7615_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
        }
        mt76_wcid_key_setup(&dev->mt76, wcid, key);
 
-       return mt7615_mcu_set_wtbl_key(dev, wcid->idx, key, cmd);
+       return mt7615_mac_wtbl_set_key(dev, wcid->idx, key);
 }
 
 static int mt7615_config(struct ieee80211_hw *hw, u32 changed)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index e05ef57441a253fcb63416067d3249a14b49d953..6269abc7860619c35218322a735f2127e76c7846 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -877,45 +877,6 @@ int mt7615_mcu_set_bss_info(struct mt7615_dev *dev,
        return ret;
 }
 
-int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid,
-                           struct ieee80211_key_conf *key,
-                           enum set_key_cmd cmd)
-{
-       struct {
-               struct wtbl_req_hdr hdr;
-               struct wtbl_sec_key key;
-       } req = {
-               .hdr = {
-                       .wlan_idx = wcid,
-                       .operation = WTBL_SET,
-                       .tlv_num = cpu_to_le16(1),
-               },
-               .key = {
-                       .tag = cpu_to_le16(WTBL_SEC_KEY),
-                       .len = cpu_to_le16(sizeof(struct wtbl_sec_key)),
-                       .add = cmd,
-               },
-       };
-
-       if (cmd == SET_KEY) {
-               u8 cipher;
-
-               cipher = mt7615_mac_get_key_info(key, req.key.key_material);
-               if (cipher == MT_CIPHER_NONE)
-                       return -EOPNOTSUPP;
-
-               req.key.rkv = 1;
-               req.key.cipher_id = cipher;
-               req.key.key_id = key->keyidx;
-               req.key.key_len = key->keylen;
-       } else {
-               req.key.key_len = sizeof(req.key.key_material);
-       }
-
-       return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
-                                  &req, sizeof(req), true);
-}
-
 static int
 mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev,
                        struct mt7615_vif *mvif)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 2f43101343c3002337181d33782a4c108fe39e0c..e6067c88cbbd39d6e2999a46e893896662fe81fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -157,9 +157,6 @@ int mt7615_mcu_set_dev_info(struct mt7615_dev *dev,
                            struct ieee80211_vif *vif, bool enable);
 int mt7615_mcu_set_bss_info(struct mt7615_dev *dev, struct ieee80211_vif *vif,
                            int en);
-int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid,
-                           struct ieee80211_key_conf *key,
-                           enum set_key_cmd cmd);
 void mt7615_mac_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta,
                          struct ieee80211_tx_rate *probe_rate,
                          struct ieee80211_tx_rate *rates);
@@ -222,6 +219,8 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,
 int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb);
 void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data);
 void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb);
+int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, int wcid,
+                           struct ieee80211_key_conf *key);
 
 int mt7615_mcu_set_eeprom(struct mt7615_dev *dev);
 int mt7615_mcu_init_mac(struct mt7615_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
index c1353deb2b7c89ab1707e1421713fb9e6ed5bfc6..1dcd202746efc4e48bbc0c4d18a09803ef12f9fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
@@ -161,8 +161,15 @@
 #define MT_WTBL_OFF_BASE               0x23400
 #define MT_WTBL_OFF(n)                 (MT_WTBL_OFF_BASE + (n))
 
+#define MT_WTBL_W0_KEY_IDX             GENMASK(24, 23)
+#define MT_WTBL_W0_RX_KEY_VALID                BIT(26)
+#define MT_WTBL_W0_RX_IK_VALID         BIT(27)
+
+#define MT_WTBL_W2_KEY_TYPE            GENMASK(7, 4)
+
 #define MT_WTBL_UPDATE                 MT_WTBL_OFF(0x030)
 #define MT_WTBL_UPDATE_WLAN_IDX                GENMASK(7, 0)
+#define MT_WTBL_UPDATE_RXINFO_UPDATE   BIT(11)
 #define MT_WTBL_UPDATE_RATE_UPDATE     BIT(13)
 #define MT_WTBL_UPDATE_TX_COUNT_CLEAR  BIT(14)
 #define MT_WTBL_UPDATE_BUSY            BIT(31)
@@ -170,6 +177,9 @@
 #define MT_WTBL_ON_BASE                        0x23000
 #define MT_WTBL_ON(_n)                 (MT_WTBL_ON_BASE + (_n))
 
+#define MT_WTBL_RICR0                  MT_WTBL_ON(0x010)
+#define MT_WTBL_RICR1                  MT_WTBL_ON(0x014)
+
 #define MT_WTBL_RIUCR0                 MT_WTBL_ON(0x020)
 
 #define MT_WTBL_RIUCR1                 MT_WTBL_ON(0x024)