Commit 6683d988 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mt76_connac_mcu_add_key in connac module 



Move key configuration code shared between mt7921 and mt7915 in
mt76-connac module and remove duplicated code.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent e6d557a7

drivers/net/wireless/mediatek/mt76/mt76_connac.h

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ struct mt76_connac_coredump { 
	unsigned long last_activity;

};



struct mt76_connac_sta_key_conf {

	s8 keyidx;

	u8 key[16];

};



extern const struct wiphy_wowlan_support mt76_connac_wowlan_support;



static inline bool is_mt7922(struct mt76_dev *dev)

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+88 −0
Original line number Diff line number Diff line
@@ -2482,5 +2482,93 @@ void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val) 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_wr);



static int

mt76_connac_mcu_sta_key_tlv(struct mt76_connac_sta_key_conf *sta_key_conf,

			    struct sk_buff *skb,

			    struct ieee80211_key_conf *key,

			    enum set_key_cmd cmd)

{

	struct sta_rec_sec *sec;

	u32 len = sizeof(*sec);

	struct tlv *tlv;



	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_KEY_V2, sizeof(*sec));

	sec = (struct sta_rec_sec *)tlv;

	sec->add = cmd;



	if (cmd == SET_KEY) {

		struct sec_key *sec_key;

		u8 cipher;



		cipher = mt76_connac_mcu_get_cipher(key->cipher);

		if (cipher == MCU_CIPHER_NONE)

			return -EOPNOTSUPP;



		sec_key = &sec->key[0];

		sec_key->cipher_len = sizeof(*sec_key);



		if (cipher == MCU_CIPHER_BIP_CMAC_128) {

			sec_key->cipher_id = MCU_CIPHER_AES_CCMP;

			sec_key->key_id = sta_key_conf->keyidx;

			sec_key->key_len = 16;

			memcpy(sec_key->key, sta_key_conf->key, 16);



			sec_key = &sec->key[1];

			sec_key->cipher_id = MCU_CIPHER_BIP_CMAC_128;

			sec_key->cipher_len = sizeof(*sec_key);

			sec_key->key_len = 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);



			if (cipher == MCU_CIPHER_TKIP) {

				/* Rx/Tx MIC keys are swapped */

				memcpy(sec_key->key + 16, key->key + 24, 8);

				memcpy(sec_key->key + 24, key->key + 16, 8);

			}



			/* store key_conf for BIP batch update */

			if (cipher == MCU_CIPHER_AES_CCMP) {

				memcpy(sta_key_conf->key, key->key, key->keylen);

				sta_key_conf->keyidx = key->keyidx;

			}



			len -= sizeof(*sec_key);

			sec->n_cipher = 1;

		}

	} else {

		len -= sizeof(sec->key);

		sec->n_cipher = 0;

	}

	sec->len = cpu_to_le16(len);



	return 0;

}



int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,

			    struct mt76_connac_sta_key_conf *sta_key_conf,

			    struct ieee80211_key_conf *key, int mcu_cmd,

			    struct mt76_wcid *wcid, enum set_key_cmd cmd)

{

	struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;

	struct sk_buff *skb;

	int ret;



	skb = mt76_connac_mcu_alloc_sta_req(dev, mvif, wcid);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	ret = mt76_connac_mcu_sta_key_tlv(sta_key_conf, skb, key, cmd);

	if (ret)

		return ret;



	return mt76_mcu_skb_send_msg(dev, skb, mcu_cmd, true);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_key);



MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");

MODULE_LICENSE("Dual BSD/GPL");

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+5 −0
Original line number Diff line number Diff line
@@ -1587,4 +1587,9 @@ const struct ieee80211_sta_he_cap * 
mt76_connac_get_he_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_sta *sta);



int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,

			    struct mt76_connac_sta_key_conf *sta_key_conf,

			    struct ieee80211_key_conf *key, int mcu_cmd,

			    struct mt76_wcid *wcid, enum set_key_cmd cmd);

#endif /* __MT76_CONNAC_MCU_H */

drivers/net/wireless/mediatek/mt76/mt7915/main.c

+3 −2
Original line number Diff line number Diff line
@@ -415,8 +415,9 @@ static int mt7915_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	mt76_wcid_key_setup(&dev->mt76, wcid,

			    cmd == SET_KEY ? key : NULL);



	err = mt7915_mcu_add_key(dev, vif, msta, key, cmd);



	err = mt76_connac_mcu_add_key(&dev->mt76, vif, &msta->bip,

				      key, MCU_EXT_CMD(STA_REC_UPDATE),

				      &msta->wcid, cmd);

out:

	mutex_unlock(&dev->mt76.mutex);

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+0 −89
Original line number Diff line number Diff line
@@ -863,95 +863,6 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy, 
}



/** starec & wtbl **/

static int

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);



	tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_KEY_V2, sizeof(*sec));



	sec = (struct sta_rec_sec *)tlv;

	sec->add = cmd;



	if (cmd == SET_KEY) {

		struct sec_key *sec_key;

		u8 cipher;



		cipher = mt76_connac_mcu_get_cipher(key->cipher);

		if (cipher == MCU_CIPHER_NONE)

			return -EOPNOTSUPP;



		sec_key = &sec->key[0];

		sec_key->cipher_len = sizeof(*sec_key);



		if (cipher == MCU_CIPHER_BIP_CMAC_128) {

			sec_key->cipher_id = MCU_CIPHER_AES_CCMP;

			sec_key->key_id = bip->keyidx;

			sec_key->key_len = 16;

			memcpy(sec_key->key, bip->key, 16);



			sec_key = &sec->key[1];

			sec_key->cipher_id = MCU_CIPHER_BIP_CMAC_128;

			sec_key->cipher_len = sizeof(*sec_key);

			sec_key->key_len = 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);



			if (cipher == MCU_CIPHER_TKIP) {

				/* Rx/Tx MIC keys are swapped */

				memcpy(sec_key->key + 16, key->key + 24, 8);

				memcpy(sec_key->key + 24, key->key + 16, 8);

			}



			/* store key_conf for BIP batch update */

			if (cipher == MCU_CIPHER_AES_CCMP) {

				memcpy(bip->key, key->key, key->keylen);

				bip->keyidx = key->keyidx;

			}



			len -= sizeof(*sec_key);

			sec->n_cipher = 1;

		}

	} else {

		len -= sizeof(sec->key);

		sec->n_cipher = 0;

	}

	sec->len = cpu_to_le16(len);



	return 0;

}



int mt7915_mcu_add_key(struct mt7915_dev *dev, struct ieee80211_vif *vif,

		       struct mt7915_sta *msta, struct ieee80211_key_conf *key,

		       enum set_key_cmd cmd)

{

	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;

	struct sk_buff *skb;

	int ret;



	skb = mt76_connac_mcu_alloc_sta_req(&dev->mt76, &mvif->mt76,

					    &msta->wcid);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	ret = mt7915_mcu_sta_key_tlv(msta, skb, key, cmd);

	if (ret)

		return ret;



	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(STA_REC_UPDATE), true);

}



static void

mt7915_mcu_sta_ba_tlv(struct sk_buff *skb,

		      struct ieee80211_ampdu_params *params,