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

net: ethernet: mtk_wed: return status value in mtk_wdma_rx_reset 



Move MTK_WDMA_RESET_IDX configuration in mtk_wdma_rx_reset routine.
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 4f5ed7fb

drivers/net/ethernet/mediatek/mtk_wed.c

+12 −13
Original line number Diff line number Diff line
@@ -101,17 +101,21 @@ mtk_wdma_read_reset(struct mtk_wed_device *dev) 
	return wdma_r32(dev, MTK_WDMA_GLO_CFG);

}



static void

static int

mtk_wdma_rx_reset(struct mtk_wed_device *dev)

{

	u32 status, mask = MTK_WDMA_GLO_CFG_RX_DMA_BUSY;

	int i;

	int i, ret;



	wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_RX_DMA_EN);

	if (readx_poll_timeout(mtk_wdma_read_reset, dev, status,

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

	ret = readx_poll_timeout(mtk_wdma_read_reset, dev, status,

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

	if (ret)

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



	wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);

	wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);



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

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

			continue;
@@ -119,6 +123,8 @@ mtk_wdma_rx_reset(struct mtk_wed_device *dev) 
		wdma_w32(dev,

			 MTK_WDMA_RING_RX(i) + MTK_WED_RING_OFS_CPU_IDX, 0);

	}



	return ret;

}



static void
@@ -565,9 +571,7 @@ mtk_wed_detach(struct mtk_wed_device *dev) 


	mtk_wed_stop(dev);



	wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);

	wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);



	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);
@@ -582,7 +586,6 @@ mtk_wed_detach(struct mtk_wed_device *dev) 
		mtk_wed_wo_reset(dev);

		mtk_wed_free_rx_rings(dev);

		mtk_wed_wo_deinit(hw);

		mtk_wdma_rx_reset(dev);

	}



	if (dev->wlan.bus_type == MTK_WED_BUS_PCIE) {
@@ -999,10 +1002,6 @@ mtk_wed_reset_dma(struct mtk_wed_device *dev) 
		wed_w32(dev, MTK_WED_RESET_IDX, 0);

	}



	wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);

	wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);



	if (mtk_wed_get_rx_capa(dev))

	mtk_wdma_rx_reset(dev);



	if (busy) {