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

mt76: dma: rely on mt76_queue in mt76_dma_tx_cleanup signature 



This is a preliminary patch to move data queues in mt76_phy and properly
support dbdc

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

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

+4 −5
Original line number Diff line number Diff line
@@ -217,9 +217,8 @@ mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q) 
}



static void

mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)

mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)

{

	struct mt76_queue *q = dev->q_tx[qid];

	struct mt76_queue_entry entry;

	bool wake = false;

	int last;
@@ -255,7 +254,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) 
	}



	wake = wake && q->stopped &&

	       qid < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8;

	       q->qid < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8;

	if (wake)

		q->stopped = false;
@@ -263,7 +262,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) 
		wake_up(&dev->tx_wait);



	if (wake)

		ieee80211_wake_queue(dev->hw, qid);

		ieee80211_wake_queue(dev->hw, q->qid);

}



static void *
@@ -664,7 +663,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 
	mt76_worker_disable(&dev->tx_worker);

	netif_napi_del(&dev->tx_napi);

	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++)

		mt76_dma_tx_cleanup(dev, i, true);

		mt76_dma_tx_cleanup(dev, dev->q_tx[i], true);



	mt76_for_each_q_rx(dev, i) {

		netif_napi_del(&dev->napi[i]);

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

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ int mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data, 
		len -= cur_len;



		if (dev->queue_ops->tx_cleanup)

			dev->queue_ops->tx_cleanup(dev, MT_TXQ_FWDL, false);

			dev->queue_ops->tx_cleanup(dev, dev->q_tx[MT_TXQ_FWDL],

						   false);

	}



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ struct mt76_queue_ops { 


	void (*rx_reset)(struct mt76_dev *dev, enum mt76_rxq_id qid);



	void (*tx_cleanup)(struct mt76_dev *dev, enum mt76_txq_id qid,

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

			   bool flush);



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

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

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
	/* Flush all previous CAB queue packets */

	mt76_wr(dev, MT_WF_ARB_CAB_FLUSH, GENMASK(30, 16) | BIT(0));



	mt76_queue_tx_cleanup(dev, MT_TXQ_CAB, false);

	mt76_queue_tx_cleanup(dev, dev->mt76.q_tx[MT_TXQ_CAB], false);



	mt76_csa_check(&dev->mt76);

	if (dev->mt76.csa_complete)
@@ -135,7 +135,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
		 ((1 << (MT7603_MAX_INTERFACES - 1)) - 1)));



out:

	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);

	mt76_queue_tx_cleanup(dev, dev->mt76.q_tx[MT_TXQ_BEACON], false);

	if (dev->mt76.q_tx[MT_TXQ_BEACON]->queued >

	    hweight8(dev->mt76.beacon_mask))

		dev->beacon_check++;

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

+2 −2
Original line number Diff line number Diff line
@@ -147,13 +147,13 @@ static int mt7603_poll_tx(struct napi_struct *napi, int budget) 
	dev->tx_dma_check = 0;



	for (i = MT_TXQ_MCU; i >= 0; i--)

		mt76_queue_tx_cleanup(dev, i, false);

		mt76_queue_tx_cleanup(dev, dev->mt76.q_tx[i], false);



	if (napi_complete_done(napi, 0))

		mt7603_irq_enable(dev, MT_INT_TX_DONE_ALL);



	for (i = MT_TXQ_MCU; i >= 0; i--)

		mt76_queue_tx_cleanup(dev, i, false);

		mt76_queue_tx_cleanup(dev, dev->mt76.q_tx[i], false);



	mt7603_mac_sta_poll(dev);