Commit a93ccb5c authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2022-03-16' of https://github.com/nbd168/wireless 

mt76 patches for 5.18

- bugfixes
- mbssid support for mt7915
- 6 GHz support for mt7915
- mt7921u driver
parents de7ba639 24e69f6b

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

+3 −2
Original line number Diff line number Diff line
@@ -942,10 +942,11 @@ mt76_rx_signal(struct mt76_rx_status *status) 
	for (chains = status->chains; chains; chains >>= 1, chain_signal++) {

		int cur, diff;



		if (!(chains & BIT(0)))

		cur = *chain_signal;

		if (!(chains & BIT(0)) ||

		    cur > 0)

			continue;



		cur = *chain_signal;

		if (cur > signal)

			swap(cur, signal);

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

+11 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#define MT_MCU_RING_SIZE	32

#define MT_RX_BUF_SIZE		2048

#define MT_SKB_HEAD_LEN		128

#define MT_SKB_HEAD_LEN		256



#define MT_MAX_NON_AQL_PKT	16

#define MT_TXQ_FREE_THR		32
@@ -1274,13 +1274,21 @@ mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len, 
void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,

			 struct mt76_sta_stats *stats);

int mt76_skb_adjust_pad(struct sk_buff *skb, int pad);

int __mt76u_vendor_request(struct mt76_dev *dev, u8 req, u8 req_type,

			   u16 val, u16 offset, void *buf, size_t len);

int mt76u_vendor_request(struct mt76_dev *dev, u8 req,

			 u8 req_type, u16 val, u16 offset,

			 void *buf, size_t len);

void mt76u_single_wr(struct mt76_dev *dev, const u8 req,

		     const u16 offset, const u32 val);

int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf,

	       bool ext);

void mt76u_read_copy(struct mt76_dev *dev, u32 offset,

		     void *data, int len);

u32 ___mt76u_rr(struct mt76_dev *dev, u8 req, u8 req_type, u32 addr);

void ___mt76u_wr(struct mt76_dev *dev, u8 req, u8 req_type,

		 u32 addr, u32 val);

int __mt76u_init(struct mt76_dev *dev, struct usb_interface *intf,

		 struct mt76_bus_ops *ops);

int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf);

int mt76u_alloc_mcu_queue(struct mt76_dev *dev);

int mt76u_alloc_queues(struct mt76_dev *dev);

void mt76u_stop_tx(struct mt76_dev *dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, 
	__le32 *end = (__le32 *)&skb->data[skb->len];

	enum rx_pkt_type type;



	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));

	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);



	if (q == MT_RXQ_MCU) {

		if (type == PKT_TYPE_RX_EVENT)

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

+3 −6
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta, 
	}



	rate_set_tsf = READ_ONCE(sta->rate_set_tsf);

	rs_idx = !((u32)(FIELD_GET(MT_TXS1_F0_TIMESTAMP, le32_to_cpu(txs_data[1])) -

	rs_idx = !((u32)(le32_get_bits(txs_data[1], MT_TXS1_F0_TIMESTAMP) -

			 rate_set_tsf) < 1000000);

	rs_idx ^= rate_set_tsf & BIT(0);

	rs = &sta->rateset[rs_idx];
@@ -1244,14 +1244,11 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data) 
	struct mt7603_sta *msta = NULL;

	struct mt76_wcid *wcid;

	__le32 *txs_data = data;

	u32 txs;

	u8 wcidx;

	u8 pid;



	txs = le32_to_cpu(txs_data[4]);

	pid = FIELD_GET(MT_TXS4_PID, txs);

	txs = le32_to_cpu(txs_data[3]);

	wcidx = FIELD_GET(MT_TXS3_WCID, txs);

	pid = le32_get_bits(txs_data[4], MT_TXS4_PID);

	wcidx = le32_get_bits(txs_data[3], MT_TXS3_WCID);



	if (pid == MT_PACKET_ID_NO_ACK)

		return;

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

+9 −11
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int mt7615_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap) 
	struct ieee80211_hdr hdr;

	u16 frame_control;



	if (FIELD_GET(MT_RXD1_NORMAL_ADDR_TYPE, le32_to_cpu(rxd[1])) !=

	if (le32_get_bits(rxd[1], MT_RXD1_NORMAL_ADDR_TYPE) !=

	    MT_RXD1_NORMAL_U2M)

		return -EINVAL;
@@ -1427,7 +1427,7 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta, 
	}



	rate_set_tsf = READ_ONCE(sta->rate_set_tsf);

	rs_idx = !((u32)(FIELD_GET(MT_TXS4_F0_TIMESTAMP, le32_to_cpu(txs_data[4])) -

	rs_idx = !((u32)(le32_get_bits(txs_data[4], MT_TXS4_F0_TIMESTAMP) -

			 rate_set_tsf) < 1000000);

	rs_idx ^= rate_set_tsf & BIT(0);

	rs = &sta->rateset[rs_idx];
@@ -1558,14 +1558,11 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data) 
	struct mt76_wcid *wcid;

	struct mt76_phy *mphy = &dev->mt76.phy;

	__le32 *txs_data = data;

	u32 txs;

	u8 wcidx;

	u8 pid;



	txs = le32_to_cpu(txs_data[0]);

	pid = FIELD_GET(MT_TXS0_PID, txs);

	txs = le32_to_cpu(txs_data[2]);

	wcidx = FIELD_GET(MT_TXS2_WCID, txs);

	pid = le32_get_bits(txs_data[0], MT_TXS0_PID);

	wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);



	if (pid == MT_PACKET_ID_NO_ACK)

		return;
@@ -1653,7 +1650,7 @@ static void mt7615_mac_tx_free(struct mt7615_dev *dev, void *data, int len) 
			mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[i], false);

	}



	count = FIELD_GET(MT_TX_FREE_MSDU_ID_CNT, le16_to_cpu(free->ctrl));

	count = le16_get_bits(free->ctrl, MT_TX_FREE_MSDU_ID_CNT);

	if (is_mt7615(&dev->mt76)) {

		__le16 *token = &free->token[0];
@@ -1686,7 +1683,8 @@ bool mt7615_rx_check(struct mt76_dev *mdev, void *data, int len) 
	__le32 *end = (__le32 *)&rxd[len / 4];

	enum rx_pkt_type type;



	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));

	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);



	switch (type) {

	case PKT_TYPE_TXRX_NOTIFY:

		mt7615_mac_tx_free(dev, data, len);
@@ -1710,8 +1708,8 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, 
	enum rx_pkt_type type;

	u16 flag;



	type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));

	flag = FIELD_GET(MT_RXD0_PKT_FLAG, le32_to_cpu(rxd[0]));

	type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);

	flag = le32_get_bits(rxd[0], MT_RXD0_PKT_FLAG);

	if (type == PKT_TYPE_RX_EVENT && flag == 0x1)

		type = PKT_TYPE_NORMAL_MCU;