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: David S. Miller <[email protected]>
torvalds · Sep 27, 2016 · 44675a6 · 44675a6
2 parents 3783c09 + ca3ba10
commit 44675a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -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);
 

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -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