Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44675a6d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mediatek-pdam-lro-fixes' 



Nelson Chang says:

====================
net: ethernet: mediatek: some bug fixes for PDAM and HW LRO

1) Add to stop PDMA while stopping the frame engine
2) Modify the register settings for LRO relinquishments
3) Jump out from the waiting loop while LRO relinquishments are done
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3783c09e ca3ba106

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+2 −0
Original line number Diff line number Diff line
@@ -1374,6 +1374,7 @@ static void mtk_hwlro_rx_uninit(struct mtk_eth *eth) 
			msleep(20);

			continue;

		}

		break;

	}



	/* invalidate lro rings */
@@ -1784,6 +1785,7 @@ static int mtk_stop(struct net_device *dev) 
	napi_disable(&eth->rx_napi);



	mtk_stop_dma(eth, MTK_QDMA_GLO_CFG);

	mtk_stop_dma(eth, MTK_PDMA_GLO_CFG);



	mtk_dma_free(eth);

drivers/net/ethernet/mediatek/mtk_eth_soc.h

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ 
#define MTK_LRO_EN			BIT(0)

#define MTK_L3_CKS_UPD_EN		BIT(7)

#define MTK_LRO_ALT_PKT_CNT_MODE	BIT(21)

#define MTK_LRO_RING_RELINQUISH_REQ	(0x3 << 26)

#define MTK_LRO_RING_RELINQUISH_DONE	(0x3 << 29)

#define MTK_LRO_RING_RELINQUISH_REQ	(0x7 << 26)

#define MTK_LRO_RING_RELINQUISH_DONE	(0x7 << 29)



#define MTK_PDMA_LRO_CTRL_DW1	0x984

#define MTK_PDMA_LRO_CTRL_DW2	0x988