2020-05-07 07:29:27 +00:00
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
|
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
2020-08-11 16:13:19 +00:00
|
|
|
@@ -1364,10 +1364,11 @@ static int mtk_poll_tx_qdma(struct mtk_e
|
2020-05-04 14:27:30 +00:00
|
|
|
u32 next_cpu = desc->txd2;
|
|
|
|
|
int mac = 0;
|
|
|
|
|
|
|
|
|
|
- desc = mtk_qdma_phys_to_virt(ring, desc->txd2);
|
|
|
|
|
if ((desc->txd3 & TX_DMA_OWNER_CPU) == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
+ desc = mtk_qdma_phys_to_virt(ring, desc->txd2);
|
|
|
|
|
+
|
|
|
|
|
tx_buf = mtk_desc_to_tx_buf(ring, desc);
|
|
|
|
|
if (tx_buf->flags & MTK_TX_FLAGS_FPORT1)
|
|
|
|
|
mac = 1;
|
2020-08-11 16:13:19 +00:00
|
|
|
@@ -2191,7 +2192,7 @@ static int mtk_start_dma(struct mtk_eth
|
2020-05-04 14:27:30 +00:00
|
|
|
|
|
|
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
|
|
|
|
|
mtk_w32(eth,
|
|
|
|
|
- MTK_TX_WB_DDONE | MTK_TX_DMA_EN |
|
|
|
|
|
+ MTK_TX_DMA_EN |
|
|
|
|
|
MTK_DMA_SIZE_16DWORDS | MTK_NDP_CO_PRO |
|
|
|
|
|
MTK_RX_DMA_EN | MTK_RX_2B_OFFSET |
|
|
|
|
|
MTK_RX_BT_32DWORDS,
|
