Commit 084d60ce authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by David S. Miller

net: ethernet: mtk_wed: rename tx_wdma array in rx_wdma

Rename tx_wdma queue array in rx_wdma since this is rx side of wdma soc.
Moreover rename mtk_wed_wdma_ring_setup routine in
mtk_wed_wdma_rx_ring_setup()
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79968444
...@@ -253,8 +253,8 @@ mtk_wed_free_tx_rings(struct mtk_wed_device *dev) ...@@ -253,8 +253,8 @@ mtk_wed_free_tx_rings(struct mtk_wed_device *dev)
for (i = 0; i < ARRAY_SIZE(dev->tx_ring); i++) for (i = 0; i < ARRAY_SIZE(dev->tx_ring); i++)
mtk_wed_free_ring(dev, &dev->tx_ring[i]); mtk_wed_free_ring(dev, &dev->tx_ring[i]);
for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++) for (i = 0; i < ARRAY_SIZE(dev->rx_wdma); i++)
mtk_wed_free_ring(dev, &dev->tx_wdma[i]); mtk_wed_free_ring(dev, &dev->rx_wdma[i]);
} }
static void static void
...@@ -688,10 +688,10 @@ mtk_wed_ring_alloc(struct mtk_wed_device *dev, struct mtk_wed_ring *ring, ...@@ -688,10 +688,10 @@ mtk_wed_ring_alloc(struct mtk_wed_device *dev, struct mtk_wed_ring *ring,
} }
static int static int
mtk_wed_wdma_ring_setup(struct mtk_wed_device *dev, int idx, int size) mtk_wed_wdma_rx_ring_setup(struct mtk_wed_device *dev, int idx, int size)
{ {
u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version; u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version;
struct mtk_wed_ring *wdma = &dev->tx_wdma[idx]; struct mtk_wed_ring *wdma = &dev->rx_wdma[idx];
if (mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE, desc_size)) if (mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE, desc_size))
return -ENOMEM; return -ENOMEM;
...@@ -805,9 +805,9 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) ...@@ -805,9 +805,9 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++) for (i = 0; i < ARRAY_SIZE(dev->rx_wdma); i++)
if (!dev->tx_wdma[i].desc) if (!dev->rx_wdma[i].desc)
mtk_wed_wdma_ring_setup(dev, i, 16); mtk_wed_wdma_rx_ring_setup(dev, i, 16);
mtk_wed_hw_init(dev); mtk_wed_hw_init(dev);
mtk_wed_configure_irq(dev, irq_mask); mtk_wed_configure_irq(dev, irq_mask);
...@@ -916,7 +916,7 @@ mtk_wed_tx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs) ...@@ -916,7 +916,7 @@ mtk_wed_tx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs)
sizeof(*ring->desc))) sizeof(*ring->desc)))
return -ENOMEM; return -ENOMEM;
if (mtk_wed_wdma_ring_setup(dev, idx, MTK_WED_WDMA_RING_SIZE)) if (mtk_wed_wdma_rx_ring_setup(dev, idx, MTK_WED_WDMA_RING_SIZE))
return -ENOMEM; return -ENOMEM;
ring->reg_base = MTK_WED_RING_TX(idx); ring->reg_base = MTK_WED_RING_TX(idx);
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#define MTK_WED_TX_QUEUES 2 #define MTK_WED_TX_QUEUES 2
#define MTK_WED_RX_QUEUES 2
struct mtk_wed_hw; struct mtk_wed_hw;
struct mtk_wdma_desc; struct mtk_wdma_desc;
...@@ -66,7 +67,7 @@ struct mtk_wed_device { ...@@ -66,7 +67,7 @@ struct mtk_wed_device {
struct mtk_wed_ring tx_ring[MTK_WED_TX_QUEUES]; struct mtk_wed_ring tx_ring[MTK_WED_TX_QUEUES];
struct mtk_wed_ring txfree_ring; struct mtk_wed_ring txfree_ring;
struct mtk_wed_ring tx_wdma[MTK_WED_TX_QUEUES]; struct mtk_wed_ring rx_wdma[MTK_WED_RX_QUEUES];
struct { struct {
int size; int size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment