mt76: dma: move mt76x02_init_{tx,rx}_queue in mt76 module

Move mt76x02_init_tx_queue and mt76x02_init_rx_queue in mt76
module in order to be reused adding support for mt7603 driver
and remove duplicated code.
Squash mt76x02_init_tx_queue and mt76x02_init_rx_queue in
mt76_dma_alloc_queue

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 76629b9..4e2dfb0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -21,7 +21,9 @@
 #define DMA_DUMMY_TXWI ((void *) ~0)
 
 static int
-mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q)
+mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q,
+                    int idx, int n_desc, int bufsize,
+                    u32 ring_base)
 {
        int size;
        int i;
@@ -29,6 +31,11 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q)
        spin_lock_init(&q->lock);
        INIT_LIST_HEAD(&q->swq);
 
+       q->regs = dev->mmio.regs + ring_base + idx * MT_RING_SIZE;
+       q->ndesc = n_desc;
+       q->buf_size = bufsize;
+       q->hw_idx = idx;
+
        size = q->ndesc * sizeof(struct mt76_desc);
        q->desc = dmam_alloc_coherent(dev->dev, size, &q->desc_dma, GFP_KERNEL);
        if (!q->desc)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 7d2a93f..eb72e4b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -150,7 +150,9 @@ struct mt76_mcu_ops {
 struct mt76_queue_ops {
        int (*init)(struct mt76_dev *dev);
 
-       int (*alloc)(struct mt76_dev *dev, struct mt76_queue *q);
+       int (*alloc)(struct mt76_dev *dev, struct mt76_queue *q,
+                    int idx, int n_desc, int bufsize,
+                    u32 ring_base);
 
        int (*add_buf)(struct mt76_dev *dev, struct mt76_queue *q,
                       struct mt76_queue_buf *buf, int nbufs, u32 info,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index b3ae0aa..4606b53 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -8,15 +8,12 @@ static int
 mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_queue *q,
                     int idx, int n_desc)
 {
-       int ret;
-
-       q->hw_idx = idx;
-       q->regs = dev->mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
-       q->ndesc = n_desc;
+       int err;
 
-       ret = mt76_queue_alloc(dev, q);
-       if (ret)
-               return ret;
+       err = mt76_queue_alloc(dev, q, idx, n_desc, 0,
+                              MT_TX_RING_BASE);
+       if (err < 0)
+               return err;
 
        mt7603_irq_enable(dev, MT_INT_TX_DONE(idx));
 
@@ -119,15 +116,12 @@ static int
 mt7603_init_rx_queue(struct mt7603_dev *dev, struct mt76_queue *q,
                     int idx, int n_desc, int bufsize)
 {
-       int ret;
-
-       q->regs = dev->mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;
-       q->ndesc = n_desc;
-       q->buf_size = bufsize;
+       int err;
 
-       ret = mt76_queue_alloc(dev, q);
-       if (ret)
-               return ret;
+       err = mt76_queue_alloc(dev, q, idx, n_desc, bufsize,
+                              MT_RX_RING_BASE);
+       if (err < 0)
+               return err;
 
        mt7603_irq_enable(dev, MT_INT_RX_DONE(idx));
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index e01e0a9..531779d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -156,15 +156,12 @@ static int
 mt76x02_init_tx_queue(struct mt76x02_dev *dev, struct mt76_queue *q,
                      int idx, int n_desc)
 {
-       int ret;
+       int err;
 
-       q->regs = dev->mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
-       q->ndesc = n_desc;
-       q->hw_idx = idx;
-
-       ret = mt76_queue_alloc(dev, q);
-       if (ret)
-               return ret;
+       err = mt76_queue_alloc(dev, q, idx, n_desc, 0,
+                              MT_TX_RING_BASE);
+       if (err < 0)
+               return err;
 
        mt76x02_irq_enable(dev, MT_INT_TX_DONE(idx));
 
@@ -175,15 +172,12 @@ static int
 mt76x02_init_rx_queue(struct mt76x02_dev *dev, struct mt76_queue *q,
                      int idx, int n_desc, int bufsize)
 {
-       int ret;
+       int err;
 
-       q->regs = dev->mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;
-       q->ndesc = n_desc;
-       q->buf_size = bufsize;
-
-       ret = mt76_queue_alloc(dev, q);
-       if (ret)
-               return ret;
+       err = mt76_queue_alloc(dev, q, idx, n_desc, bufsize,
+                              MT_RX_RING_BASE);
+       if (err < 0)
+               return err;
 
        mt76x02_irq_enable(dev, MT_INT_RX_DONE(idx));