Skip to content

Commit d908d4e

Browse files
committed
mt76: use readl/writel instead of ioread32/iowrite32
Switching to readl/writel is faster because it gets rid of an unnecessary wrapper with extra checks. Signed-off-by: Felix Fietkau <[email protected]>
1 parent cee646d commit d908d4e

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q,
4949
for (i = 0; i < q->ndesc; i++)
5050
q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);
5151

52-
iowrite32(q->desc_dma, &q->regs->desc_base);
53-
iowrite32(0, &q->regs->cpu_idx);
54-
iowrite32(0, &q->regs->dma_idx);
55-
iowrite32(q->ndesc, &q->regs->ring_size);
52+
writel(q->desc_dma, &q->regs->desc_base);
53+
writel(0, &q->regs->cpu_idx);
54+
writel(0, &q->regs->dma_idx);
55+
writel(q->ndesc, &q->regs->ring_size);
5656

5757
return 0;
5858
}
@@ -136,11 +136,11 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,
136136
static void
137137
mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)
138138
{
139-
iowrite32(q->desc_dma, &q->regs->desc_base);
140-
iowrite32(q->ndesc, &q->regs->ring_size);
141-
q->head = ioread32(&q->regs->dma_idx);
139+
writel(q->desc_dma, &q->regs->desc_base);
140+
writel(q->ndesc, &q->regs->ring_size);
141+
q->head = readl(&q->regs->dma_idx);
142142
q->tail = q->head;
143-
iowrite32(q->head, &q->regs->cpu_idx);
143+
writel(q->head, &q->regs->cpu_idx);
144144
}
145145

146146
static void
@@ -159,7 +159,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)
159159
if (flush)
160160
last = -1;
161161
else
162-
last = ioread32(&q->regs->dma_idx);
162+
last = readl(&q->regs->dma_idx);
163163

164164
while (q->queued && q->tail != last) {
165165
mt76_dma_tx_cleanup_idx(dev, q, q->tail, &entry);
@@ -181,7 +181,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)
181181
}
182182

183183
if (!flush && q->tail == last)
184-
last = ioread32(&q->regs->dma_idx);
184+
last = readl(&q->regs->dma_idx);
185185
}
186186

187187
if (!flush)
@@ -251,7 +251,7 @@ mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush,
251251
static void
252252
mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)
253253
{
254-
iowrite32(q->head, &q->regs->cpu_idx);
254+
writel(q->head, &q->regs->cpu_idx);
255255
}
256256

257257
static int

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
2121
{
2222
u32 val;
2323

24-
val = ioread32(dev->mmio.regs + offset);
24+
val = readl(dev->mmio.regs + offset);
2525
trace_reg_rr(dev, offset, val);
2626

2727
return val;
@@ -30,7 +30,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
3030
static void mt76_mmio_wr(struct mt76_dev *dev, u32 offset, u32 val)
3131
{
3232
trace_reg_wr(dev, offset, val);
33-
iowrite32(val, dev->mmio.regs + offset);
33+
writel(val, dev->mmio.regs + offset);
3434
}
3535

3636
static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,11 +1392,11 @@ static bool mt7603_tx_hang(struct mt7603_dev *dev)
13921392
continue;
13931393

13941394
prev_dma_idx = dev->tx_dma_idx[i];
1395-
dma_idx = ioread32(&q->regs->dma_idx);
1395+
dma_idx = readl(&q->regs->dma_idx);
13961396
dev->tx_dma_idx[i] = dma_idx;
13971397

13981398
if (dma_idx == prev_dma_idx &&
1399-
dma_idx != ioread32(&q->regs->cpu_idx))
1399+
dma_idx != readl(&q->regs->cpu_idx))
14001400
break;
14011401
}
14021402

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)
349349
continue;
350350

351351
prev_dma_idx = dev->mt76.tx_dma_idx[i];
352-
dma_idx = ioread32(&q->regs->dma_idx);
352+
dma_idx = readl(&q->regs->dma_idx);
353353
dev->mt76.tx_dma_idx[i] = dma_idx;
354354

355355
if (prev_dma_idx == dma_idx)

0 commit comments

Comments
 (0)