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

Merge tag 'mt76-for-kvalo-2024-05-02' of https://github.com/nbd168/wireless 

mt76 patches for 6.10

- fixes
- mt7603 stability improvements
- mt7921 LED control
- mt7925 EHT radiotap support
parents daf85b78 59f4c573

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

+3 −2
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q, 
}



static int

mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,

mt76_dma_tx_queue_skb(struct mt76_phy *phy, struct mt76_queue *q,

		      enum mt76_txq_id qid, struct sk_buff *skb,

		      struct mt76_wcid *wcid, struct ieee80211_sta *sta)

{
@@ -542,6 +542,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
	struct mt76_tx_info tx_info = {

		.skb = skb,

	};

	struct mt76_dev *dev = phy->dev;

	struct ieee80211_hw *hw;

	int len, n = 0, ret = -ENOMEM;

	struct mt76_txwi_cache *t;
@@ -549,7 +550,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
	dma_addr_t addr;

	u8 *txwi;



	if (test_bit(MT76_RESET, &dev->phy.state))

	if (test_bit(MT76_RESET, &phy->state))

		goto free_skb;



	t = mt76_get_txwi(dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw) 
	ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);

	ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU);

	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);

	ieee80211_hw_set(hw, SPECTRUM_MGMT);



	if (!(dev->drv->drv_flags & MT_DRV_AMSDU_OFFLOAD) &&

	    hw->max_tx_fragments > 1) {

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

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ struct mt76_queue_ops { 
		     int idx, int n_desc, int bufsize,

		     u32 ring_base);



	int (*tx_queue_skb)(struct mt76_dev *dev, struct mt76_queue *q,

	int (*tx_queue_skb)(struct mt76_phy *phy, struct mt76_queue *q,

			    enum mt76_txq_id qid, struct sk_buff *skb,

			    struct mt76_wcid *wcid, struct ieee80211_sta *sta);
@@ -1127,7 +1127,7 @@ static inline int mt76_wed_dma_setup(struct mt76_dev *dev, struct mt76_queue *q, 
#define mt76_init_queues(dev, ...)		(dev)->mt76.queue_ops->init(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_alloc(dev, ...)	(dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)

#define mt76_tx_queue_skb_raw(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb_raw(&((dev)->mt76), __VA_ARGS__)

#define mt76_tx_queue_skb(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb(&((dev)->mt76), __VA_ARGS__)

#define mt76_tx_queue_skb(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb(&((dev)->mphy), __VA_ARGS__)

#define mt76_queue_rx_reset(dev, ...)	(dev)->mt76.queue_ops->rx_reset(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_tx_cleanup(dev, ...)	(dev)->mt76.queue_ops->tx_cleanup(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_rx_cleanup(dev, ...)	(dev)->mt76.queue_ops->rx_cleanup(&((dev)->mt76), __VA_ARGS__)

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

+32 −14
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 
#include "mac.h"

#include "../dma.h"



static const u8 wmm_queue_map[] = {

	[IEEE80211_AC_BK] = 0,

	[IEEE80211_AC_BE] = 1,

	[IEEE80211_AC_VI] = 2,

	[IEEE80211_AC_VO] = 3,

};



static void

mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)

{
@@ -22,10 +29,10 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) 
	struct ieee80211_sta *sta;

	struct mt7603_sta *msta;

	struct mt76_wcid *wcid;

	u8 tid = 0, hwq = 0;

	void *priv;

	int idx;

	u32 val;

	u8 tid = 0;



	if (skb->len < MT_TXD_SIZE + sizeof(struct ieee80211_hdr))

		goto free;
@@ -42,19 +49,36 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) 
		goto free;



	priv = msta = container_of(wcid, struct mt7603_sta, wcid);

	val = le32_to_cpu(txd[0]);

	val &= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);

	val |= FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_HW_QUEUE_MGMT);

	txd[0] = cpu_to_le32(val);



	sta = container_of(priv, struct ieee80211_sta, drv_priv);

	hdr = (struct ieee80211_hdr *)&skb->data[MT_TXD_SIZE];

	if (ieee80211_is_data_qos(hdr->frame_control))



	hwq = wmm_queue_map[IEEE80211_AC_BE];

	if (ieee80211_is_data_qos(hdr->frame_control)) {

		tid = *ieee80211_get_qos_ctl(hdr) &

			 IEEE80211_QOS_CTL_TAG1D_MASK;

	skb_set_queue_mapping(skb, tid_to_ac[tid]);

		u8 qid = tid_to_ac[tid];

		hwq = wmm_queue_map[qid];

		skb_set_queue_mapping(skb, qid);

	} else if (ieee80211_is_data(hdr->frame_control)) {

		skb_set_queue_mapping(skb, IEEE80211_AC_BE);

		hwq = wmm_queue_map[IEEE80211_AC_BE];

	} else {

		skb_pull(skb, MT_TXD_SIZE);

		if (!ieee80211_is_bufferable_mmpdu(skb))

			goto free;

		skb_push(skb, MT_TXD_SIZE);

		skb_set_queue_mapping(skb, MT_TXQ_PSD);

		hwq = MT_TX_HW_QUEUE_MGMT;

	}



	ieee80211_sta_set_buffered(sta, tid, true);



	val = le32_to_cpu(txd[0]);

	val &= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);

	val |= FIELD_PREP(MT_TXD0_Q_IDX, hwq);

	txd[0] = cpu_to_le32(val);



	spin_lock_bh(&dev->ps_lock);

	__skb_queue_tail(&msta->psq, skb);

	if (skb_queue_len(&msta->psq) >= 64) {
@@ -151,12 +175,6 @@ static int mt7603_poll_tx(struct napi_struct *napi, int budget) 


int mt7603_dma_init(struct mt7603_dev *dev)

{

	static const u8 wmm_queue_map[] = {

		[IEEE80211_AC_BK] = 0,

		[IEEE80211_AC_BE] = 1,

		[IEEE80211_AC_VI] = 2,

		[IEEE80211_AC_VO] = 3,

	};

	int ret;

	int i;

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

+1 −0
Original line number Diff line number Diff line
@@ -1393,6 +1393,7 @@ void mt7603_pse_client_reset(struct mt7603_dev *dev) 
		   MT_CLIENT_RESET_TX_R_E_2_S);



	/* Start PSE client TX abort */

	mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_FORCE_TX_EOF);

	mt76_set(dev, addr, MT_CLIENT_RESET_TX_R_E_1);

	mt76_poll_msec(dev, addr, MT_CLIENT_RESET_TX_R_E_1_S,

		       MT_CLIENT_RESET_TX_R_E_1_S, 500);