Commit ed883bec authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jakub Kicinski
Browse files

net: ethernet: mtk_wed: add reset to rx_ring_setup callback 



This patch adds reset parameter to mtk_wed_rx_ring_setup signature
in order to align rx_ring_setup callback to tx_ring_setup one introduced
in 'commit 23dca7a9 ("net: ethernet: mtk_wed: add reset to
tx_ring_setup callback")'

Co-developed-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/29c6e7a5469e784406cf3e2920351d1207713d05.1670239984.git.lorenzo@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e3bd74c3

drivers/net/ethernet/mediatek/mtk_wed.c

+13 −7
Original line number Diff line number Diff line
@@ -1210,7 +1210,8 @@ mtk_wed_wdma_rx_ring_setup(struct mtk_wed_device *dev, int idx, int size, 
}



static int

mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size)

mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size,

			   bool reset)

{

	u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version;

	struct mtk_wed_ring *wdma;
@@ -1219,8 +1220,8 @@ mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size) 
		return -EINVAL;



	wdma = &dev->tx_wdma[idx];

	if (mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE, desc_size,

			       true))

	if (!reset && mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE,

					 desc_size, true))

		return -ENOMEM;



	wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_BASE,
@@ -1230,6 +1231,9 @@ mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size) 
	wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_CPU_IDX, 0);

	wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_DMA_IDX, 0);



	if (reset)

		mtk_wed_ring_reset(wdma, MTK_WED_WDMA_RING_SIZE, true);



	if (!idx)  {

		wed_w32(dev, MTK_WED_WDMA_RING_TX + MTK_WED_RING_OFS_BASE,

			wdma->desc_phys);
@@ -1569,18 +1573,20 @@ mtk_wed_txfree_ring_setup(struct mtk_wed_device *dev, void __iomem *regs) 
}



static int

mtk_wed_rx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs)

mtk_wed_rx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs,

		      bool reset)

{

	struct mtk_wed_ring *ring = &dev->rx_ring[idx];



	if (WARN_ON(idx >= ARRAY_SIZE(dev->rx_ring)))

		return -EINVAL;



	if (mtk_wed_ring_alloc(dev, ring, MTK_WED_RX_RING_SIZE,

	if (!reset && mtk_wed_ring_alloc(dev, ring, MTK_WED_RX_RING_SIZE,

					 sizeof(*ring->desc), false))

		return -ENOMEM;



	if (mtk_wed_wdma_tx_ring_setup(dev, idx, MTK_WED_WDMA_RING_SIZE))

	if (mtk_wed_wdma_tx_ring_setup(dev, idx, MTK_WED_WDMA_RING_SIZE,

				       reset))

		return -ENOMEM;



	ring->reg_base = MTK_WED_RING_RX_DATA(idx);

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

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q) 
			q->wed_regs = wed->txfree_ring.reg_base;

		break;

	case MT76_WED_Q_RX:

		ret = mtk_wed_device_rx_ring_setup(wed, ring, q->regs);

		ret = mtk_wed_device_rx_ring_setup(wed, ring, q->regs, false);

		if (!ret)

			q->wed_regs = wed->rx_ring[ring].reg_base;

		break;

include/linux/soc/mediatek/mtk_wed.h

+4 −4
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ struct mtk_wed_ops { 
	int (*tx_ring_setup)(struct mtk_wed_device *dev, int ring,

			     void __iomem *regs, bool reset);

	int (*rx_ring_setup)(struct mtk_wed_device *dev, int ring,

			     void __iomem *regs);

			     void __iomem *regs, bool reset);

	int (*txfree_ring_setup)(struct mtk_wed_device *dev,

				 void __iomem *regs);

	int (*msg_update)(struct mtk_wed_device *dev, int cmd_id,
@@ -228,8 +228,8 @@ mtk_wed_get_rx_capa(struct mtk_wed_device *dev) 
	(_dev)->ops->irq_get(_dev, _mask)

#define mtk_wed_device_irq_set_mask(_dev, _mask) \

	(_dev)->ops->irq_set_mask(_dev, _mask)

#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs) \

	(_dev)->ops->rx_ring_setup(_dev, _ring, _regs)

#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs, _reset) \

	(_dev)->ops->rx_ring_setup(_dev, _ring, _regs, _reset)

#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash) \

	(_dev)->ops->ppe_check(_dev, _skb, _reason, _hash)

#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) \
@@ -249,7 +249,7 @@ static inline bool mtk_wed_device_active(struct mtk_wed_device *dev) 
#define mtk_wed_device_reg_write(_dev, _reg, _val) do {} while (0)

#define mtk_wed_device_irq_get(_dev, _mask) 0

#define mtk_wed_device_irq_set_mask(_dev, _mask) do {} while (0)

#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs) -ENODEV

#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs, _reset) -ENODEV

#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash)  do {} while (0)

#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) -ENODEV

#define mtk_wed_device_stop(_dev) do {} while (0)