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

wifi: mt76: Add reset_idx to reset_q mt76_queue_ops signature. 



Remove __mt76_dma_queue_reset routine and use mt76_dma_queue_reset
directly instead in mt76_queue_ops struct.
This is a preliminary patch to enable WED support for MT7992 Kite
chipset supported by MT7996 driver.

Co-developed-by: default avatarRex Lu <rex.lu@mediatek.com>
Signed-off-by: default avatarRex Lu <rex.lu@mediatek.com>
Co-developed-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Co-developed-by: default avatarBenjamin Lin <benjamin-jw.lin@mediatek.com>
Signed-off-by: default avatarBenjamin Lin <benjamin-jw.lin@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250909-mt7996-rro-rework-v5-1-7d66f6eb7795@kernel.org


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f5160304

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

+3 −8
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q) 
	q->tail = q->head;

}



void __mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,

void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,

			  bool reset_idx)

{

	if (!q || !q->ndesc)
@@ -218,11 +218,6 @@ void __mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q, 
	mt76_dma_sync_idx(dev, q);

}



void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)

{

	__mt76_dma_queue_reset(dev, q, true);

}



static int

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

		    struct mt76_queue_buf *buf, void *data)
@@ -740,7 +735,7 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q, 
			return 0;

	}



	mt76_dma_queue_reset(dev, q);

	mt76_dma_queue_reset(dev, q, true);



	return 0;

}

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

+3 −4
Original line number Diff line number Diff line
@@ -81,14 +81,13 @@ void mt76_dma_attach(struct mt76_dev *dev); 
void mt76_dma_cleanup(struct mt76_dev *dev);

int mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q,

		     bool allow_direct);

void __mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,

void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,

			  bool reset_idx);

void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q);



static inline void

mt76_dma_reset_tx_queue(struct mt76_dev *dev, struct mt76_queue *q)

{

	dev->queue_ops->reset_q(dev, q);

	dev->queue_ops->reset_q(dev, q, true);

	if (mtk_wed_device_active(&dev->mmio.wed))

		mt76_wed_dma_setup(dev, q, true);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ struct mt76_queue_ops { 


	void (*kick)(struct mt76_dev *dev, struct mt76_queue *q);



	void (*reset_q)(struct mt76_dev *dev, struct mt76_queue *q);

	void (*reset_q)(struct mt76_dev *dev, struct mt76_queue *q,

			bool reset_idx);

};



enum mt76_phy_type {

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

+2 −2
Original line number Diff line number Diff line
@@ -624,13 +624,13 @@ int mt7915_dma_reset(struct mt7915_dev *dev, bool force) 
	}



	for (i = 0; i < __MT_MCUQ_MAX; i++)

		mt76_queue_reset(dev, dev->mt76.q_mcu[i]);

		mt76_queue_reset(dev, dev->mt76.q_mcu[i], true);



	mt76_for_each_q_rx(&dev->mt76, i) {

		if (mt76_queue_is_wed_tx_free(&dev->mt76.q_rx[i]))

			continue;



		mt76_queue_reset(dev, &dev->mt76.q_rx[i]);

		mt76_queue_reset(dev, &dev->mt76.q_rx[i], true);

	}



	mt76_tx_status_check(&dev->mt76, true);

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

+3 −3
Original line number Diff line number Diff line
@@ -181,13 +181,13 @@ mt792x_dma_reset(struct mt792x_dev *dev, bool force) 


	/* reset hw queues */

	for (i = 0; i < __MT_TXQ_MAX; i++)

		mt76_queue_reset(dev, dev->mphy.q_tx[i]);

		mt76_queue_reset(dev, dev->mphy.q_tx[i], true);



	for (i = 0; i < __MT_MCUQ_MAX; i++)

		mt76_queue_reset(dev, dev->mt76.q_mcu[i]);

		mt76_queue_reset(dev, dev->mt76.q_mcu[i], true);



	mt76_for_each_q_rx(&dev->mt76, i)

		mt76_queue_reset(dev, &dev->mt76.q_rx[i]);

		mt76_queue_reset(dev, &dev->mt76.q_rx[i], true);



	mt76_tx_status_check(&dev->mt76, true);