Commit c368362c authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: fix iv and CCMP header insertion 



The iv from RXD is only for TKIP_RSC/CCMP_PN/GCMP_PN, and it needs a
check for CCMP header insertion. Move mt76_cipher_type to mt76.h to
reduce duplicated code.

Signed-off-by: default avatarXing Song <xing.song@mediatek.com>
Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 723885a6

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

+16 −0
Original line number Diff line number Diff line
@@ -87,6 +87,22 @@ enum mt76_rxq_id { 
	__MT_RXQ_MAX

};



enum mt76_cipher_type {

	MT_CIPHER_NONE,

	MT_CIPHER_WEP40,

	MT_CIPHER_TKIP,

	MT_CIPHER_TKIP_NO_MIC,

	MT_CIPHER_AES_CCMP,

	MT_CIPHER_WEP104,

	MT_CIPHER_BIP_CMAC_128,

	MT_CIPHER_WEP128,

	MT_CIPHER_WAPI,

	MT_CIPHER_CCMP_CCX,

	MT_CIPHER_CCMP_256,

	MT_CIPHER_GCMP,

	MT_CIPHER_GCMP_256,

};



struct mt76_queue_buf {

	dma_addr_t addr;

	u16 len;

drivers/net/wireless/mediatek/mt76/mt7603/mac.c

+23 −10
Original line number Diff line number Diff line
@@ -550,14 +550,27 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb) 
		u8 *data = (u8 *)rxd;



		if (status->flag & RX_FLAG_DECRYPTED) {

			switch (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2)) {

			case MT_CIPHER_AES_CCMP:

			case MT_CIPHER_CCMP_CCX:

			case MT_CIPHER_CCMP_256:

				insert_ccmp_hdr =

					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);

				fallthrough;

			case MT_CIPHER_TKIP:

			case MT_CIPHER_TKIP_NO_MIC:

			case MT_CIPHER_GCMP:

			case MT_CIPHER_GCMP_256:

				status->iv[0] = data[5];

				status->iv[1] = data[4];

				status->iv[2] = data[3];

				status->iv[3] = data[2];

				status->iv[4] = data[1];

				status->iv[5] = data[0];



			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);

				break;

			default:

				break;

			}

		}



		rxd += 4;
@@ -831,7 +844,7 @@ void mt7603_wtbl_set_rates(struct mt7603_dev *dev, struct mt7603_sta *sta, 
	sta->wcid.tx_info |= MT_WCID_TX_INFO_SET;

}



static enum mt7603_cipher_type

static enum mt76_cipher_type

mt7603_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

{

	memset(key_data, 0, 32);
@@ -863,7 +876,7 @@ mt7603_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data) 
int mt7603_wtbl_set_key(struct mt7603_dev *dev, int wcid,

			struct ieee80211_key_conf *key)

{

	enum mt7603_cipher_type cipher;

	enum mt76_cipher_type cipher;

	u32 addr = mt7603_wtbl3_addr(wcid);

	u8 key_data[32];

	int key_len = sizeof(key_data);

drivers/net/wireless/mediatek/mt76/mt7603/regs.h

+0 −12
Original line number Diff line number Diff line
@@ -765,16 +765,4 @@ enum { 
#define MT_WTBL1_OR			(MT_WTBL1_BASE + 0x2300)

#define MT_WTBL1_OR_PSM_WRITE		BIT(31)



enum mt7603_cipher_type {

	MT_CIPHER_NONE,

	MT_CIPHER_WEP40,

	MT_CIPHER_TKIP,

	MT_CIPHER_TKIP_NO_MIC,

	MT_CIPHER_AES_CCMP,

	MT_CIPHER_WEP104,

	MT_CIPHER_BIP_CMAC_128,

	MT_CIPHER_WEP128,

	MT_CIPHER_WAPI,

};



#endif

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+52 −12
Original line number Diff line number Diff line
@@ -57,6 +57,33 @@ static const struct mt7615_dfs_radar_spec jp_radar_specs = { 
	},

};



static enum mt76_cipher_type

mt7615_mac_get_cipher(int cipher)

{

	switch (cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		return MT_CIPHER_WEP40;

	case WLAN_CIPHER_SUITE_WEP104:

		return MT_CIPHER_WEP104;

	case WLAN_CIPHER_SUITE_TKIP:

		return MT_CIPHER_TKIP;

	case WLAN_CIPHER_SUITE_AES_CMAC:

		return MT_CIPHER_BIP_CMAC_128;

	case WLAN_CIPHER_SUITE_CCMP:

		return MT_CIPHER_AES_CCMP;

	case WLAN_CIPHER_SUITE_CCMP_256:

		return MT_CIPHER_CCMP_256;

	case WLAN_CIPHER_SUITE_GCMP:

		return MT_CIPHER_GCMP;

	case WLAN_CIPHER_SUITE_GCMP_256:

		return MT_CIPHER_GCMP_256;

	case WLAN_CIPHER_SUITE_SMS4:

		return MT_CIPHER_WAPI;

	default:

		return MT_CIPHER_NONE;

	}

}



static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev,

					    u8 idx, bool unicast)

{
@@ -313,14 +340,27 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) 
		u8 *data = (u8 *)rxd;



		if (status->flag & RX_FLAG_DECRYPTED) {

			switch (FIELD_GET(MT_RXD2_NORMAL_SEC_MODE, rxd2)) {

			case MT_CIPHER_AES_CCMP:

			case MT_CIPHER_CCMP_CCX:

			case MT_CIPHER_CCMP_256:

				insert_ccmp_hdr =

					FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);

				fallthrough;

			case MT_CIPHER_TKIP:

			case MT_CIPHER_TKIP_NO_MIC:

			case MT_CIPHER_GCMP:

			case MT_CIPHER_GCMP_256:

				status->iv[0] = data[5];

				status->iv[1] = data[4];

				status->iv[2] = data[3];

				status->iv[3] = data[2];

				status->iv[4] = data[1];

				status->iv[5] = data[0];



			insert_ccmp_hdr = FIELD_GET(MT_RXD2_NORMAL_FRAG, rxd2);

				break;

			default:

				break;

			}

		}

		rxd += 4;

		if ((u8 *)rxd - skb->data >= skb->len)
@@ -1078,7 +1118,7 @@ EXPORT_SYMBOL_GPL(mt7615_mac_set_rates); 
static int

mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,

			   struct ieee80211_key_conf *key,

			   enum mt7615_cipher_type cipher, u16 cipher_mask,

			   enum mt76_cipher_type cipher, u16 cipher_mask,

			   enum set_key_cmd cmd)

{

	u32 addr = mt7615_mac_wtbl_addr(dev, wcid->idx) + 30 * 4;
@@ -1118,7 +1158,7 @@ mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid, 


static int

mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid,

			  enum mt7615_cipher_type cipher, u16 cipher_mask,

			  enum mt76_cipher_type cipher, u16 cipher_mask,

			  int keyidx, enum set_key_cmd cmd)

{

	u32 addr = mt7615_mac_wtbl_addr(dev, wcid->idx), w0, w1;
@@ -1157,7 +1197,7 @@ mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid, 


static void

mt7615_mac_wtbl_update_cipher(struct mt7615_dev *dev, struct mt76_wcid *wcid,

			      enum mt7615_cipher_type cipher, u16 cipher_mask,

			      enum mt76_cipher_type cipher, u16 cipher_mask,

			      enum set_key_cmd cmd)

{

	u32 addr = mt7615_mac_wtbl_addr(dev, wcid->idx);
@@ -1183,7 +1223,7 @@ int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, 
			      struct ieee80211_key_conf *key,

			      enum set_key_cmd cmd)

{

	enum mt7615_cipher_type cipher;

	enum mt76_cipher_type cipher;

	u16 cipher_mask = wcid->cipher;

	int err;

drivers/net/wireless/mediatek/mt76/mt7615/mac.h

+0 −42
Original line number Diff line number Diff line
@@ -383,48 +383,6 @@ struct mt7615_dfs_radar_spec { 
	struct mt7615_dfs_pattern radar_pattern[16];

};



enum mt7615_cipher_type {

	MT_CIPHER_NONE,

	MT_CIPHER_WEP40,

	MT_CIPHER_TKIP,

	MT_CIPHER_TKIP_NO_MIC,

	MT_CIPHER_AES_CCMP,

	MT_CIPHER_WEP104,

	MT_CIPHER_BIP_CMAC_128,

	MT_CIPHER_WEP128,

	MT_CIPHER_WAPI,

	MT_CIPHER_CCMP_256 = 10,

	MT_CIPHER_GCMP,

	MT_CIPHER_GCMP_256,

};



static inline enum mt7615_cipher_type

mt7615_mac_get_cipher(int cipher)

{

	switch (cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		return MT_CIPHER_WEP40;

	case WLAN_CIPHER_SUITE_WEP104:

		return MT_CIPHER_WEP104;

	case WLAN_CIPHER_SUITE_TKIP:

		return MT_CIPHER_TKIP;

	case WLAN_CIPHER_SUITE_AES_CMAC:

		return MT_CIPHER_BIP_CMAC_128;

	case WLAN_CIPHER_SUITE_CCMP:

		return MT_CIPHER_AES_CCMP;

	case WLAN_CIPHER_SUITE_CCMP_256:

		return MT_CIPHER_CCMP_256;

	case WLAN_CIPHER_SUITE_GCMP:

		return MT_CIPHER_GCMP;

	case WLAN_CIPHER_SUITE_GCMP_256:

		return MT_CIPHER_GCMP_256;

	case WLAN_CIPHER_SUITE_SMS4:

		return MT_CIPHER_WAPI;

	default:

		return MT_CIPHER_NONE;

	}

}



static inline struct mt7615_txp_common *

mt7615_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)

{