Commit 92b11696 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Paolo Abeni
Browse files

net: ethernet: mtk_wed: move MTK_WDMA_RESET_IDX_TX configuration in mtk_wdma_tx_reset 



Remove duplicated code. Increase poll timeout to 10ms in order to be
aligned with vendor sdk.
This is a preliminary patch to add Wireless Ethernet Dispatcher reset
support.

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>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b0488c45

drivers/net/ethernet/mediatek/mtk_wed.c

+4 −11
Original line number Diff line number Diff line
@@ -135,17 +135,16 @@ mtk_wdma_tx_reset(struct mtk_wed_device *dev) 


	wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_TX_DMA_EN);

	if (readx_poll_timeout(mtk_wdma_read_reset, dev, status,

			       !(status & mask), 0, 1000))

			       !(status & mask), 0, 10000))

		dev_err(dev->hw->dev, "tx reset failed\n");



	for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++) {

		if (dev->tx_wdma[i].desc)

			continue;

	wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_TX);

	wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);



	for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++)

		wdma_w32(dev,

			 MTK_WDMA_RING_TX(i) + MTK_WED_RING_OFS_CPU_IDX, 0);

}

}



static void

mtk_wed_reset(struct mtk_wed_device *dev, u32 mask)
@@ -573,12 +572,6 @@ mtk_wed_detach(struct mtk_wed_device *dev) 


	mtk_wdma_rx_reset(dev);

	mtk_wed_reset(dev, MTK_WED_RESET_WED);

	if (mtk_wed_get_rx_capa(dev)) {

		wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_TX_DMA_EN);

		wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_TX);

		wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);

	}



	mtk_wed_free_tx_buffer(dev);

	mtk_wed_free_tx_rings(dev);