Skip to content

Commit cc9fd94

Browse files
committed
mt76: dma: add wrapper macro for accessing queue registers
Preparation for adding indirection used for Wireless Ethernet Dispatch support Signed-off-by: Felix Fietkau <[email protected]>
1 parent 1dfe52a commit cc9fd94

File tree

1 file changed

+12
-9
lines changed
  • drivers/net/wireless/mediatek/mt76

1 file changed

+12
-9
lines changed

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

+12-9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
#include "mt76.h"
88
#include "dma.h"
99

10+
#define Q_READ(_dev, _q, _field) readl(&(_q)->regs->_field)
11+
#define Q_WRITE(_dev, _q, _field, _val) writel(_val, &(_q)->regs->_field)
12+
13+
1014
static struct mt76_txwi_cache *
1115
mt76_alloc_txwi(struct mt76_dev *dev)
1216
{
@@ -84,9 +88,9 @@ mt76_free_pending_txwi(struct mt76_dev *dev)
8488
static void
8589
mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)
8690
{
87-
writel(q->desc_dma, &q->regs->desc_base);
88-
writel(q->ndesc, &q->regs->ring_size);
89-
q->head = readl(&q->regs->dma_idx);
91+
Q_WRITE(dev, q, desc_base, q->desc_dma);
92+
Q_WRITE(dev, q, ring_size, q->ndesc);
93+
q->head = Q_READ(dev, q, dma_idx);
9094
q->tail = q->head;
9195
}
9296

@@ -102,8 +106,8 @@ mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)
102106
for (i = 0; i < q->ndesc; i++)
103107
q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);
104108

105-
writel(0, &q->regs->cpu_idx);
106-
writel(0, &q->regs->dma_idx);
109+
Q_WRITE(dev, q, cpu_idx, 0);
110+
Q_WRITE(dev, q, dma_idx, 0);
107111
mt76_dma_sync_idx(dev, q);
108112
}
109113

@@ -226,7 +230,7 @@ static void
226230
mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)
227231
{
228232
wmb();
229-
writel(q->head, &q->regs->cpu_idx);
233+
Q_WRITE(dev, q, cpu_idx, q->head);
230234
}
231235

232236
static void
@@ -242,7 +246,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)
242246
if (flush)
243247
last = -1;
244248
else
245-
last = readl(&q->regs->dma_idx);
249+
last = Q_READ(dev, q, dma_idx);
246250

247251
while (q->queued > 0 && q->tail != last) {
248252
mt76_dma_tx_cleanup_idx(dev, q, q->tail, &entry);
@@ -254,8 +258,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)
254258
}
255259

256260
if (!flush && q->tail == last)
257-
last = readl(&q->regs->dma_idx);
258-
261+
last = Q_READ(dev, q, dma_idx);
259262
}
260263
spin_unlock_bh(&q->cleanup_lock);
261264

0 commit comments

Comments
 (0)