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

Commit c6f1dc4d authored by Sean Wang's avatar Sean Wang Committed by David S. Miller
Browse files

net: ethernet: mediatek: fix fails from TX housekeeping due to incorrect port setup 



which net device the SKB is complete for depends on the forward port
on txd4 on the corresponding TX descriptor, but the information isn't
set up well in case of  SKB fragments that would lead to watchdog timeout
from the upper layer, so fix it up.

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Acked-by: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9264251e

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -588,14 +588,15 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, 
	dma_addr_t mapped_addr;

	dma_addr_t mapped_addr;

	unsigned int nr_frags;

	unsigned int nr_frags;

	int i, n_desc = 1;

	int i, n_desc = 1;

	u32 txd4 = 0;

	u32 txd4 = 0, fport;





	itxd = ring->next_free;

	itxd = ring->next_free;

	if (itxd == ring->last_free)

	if (itxd == ring->last_free)

		return -ENOMEM;

		return -ENOMEM;





	/* set the forward port */

	/* set the forward port */

	txd4 |= (mac->id + 1) << TX_DMA_FPORT_SHIFT;

	fport = (mac->id + 1) << TX_DMA_FPORT_SHIFT;

	txd4 |= fport;





	tx_buf = mtk_desc_to_tx_buf(ring, itxd);

	tx_buf = mtk_desc_to_tx_buf(ring, itxd);

	memset(tx_buf, 0, sizeof(*tx_buf));

	memset(tx_buf, 0, sizeof(*tx_buf));
@@ -653,7 +654,7 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, 
			WRITE_ONCE(txd->txd3, (TX_DMA_SWC |

			WRITE_ONCE(txd->txd3, (TX_DMA_SWC |

					       TX_DMA_PLEN0(frag_map_size) |

					       TX_DMA_PLEN0(frag_map_size) |

					       last_frag * TX_DMA_LS0));

					       last_frag * TX_DMA_LS0));

			WRITE_ONCE(txd->txd4, 0);

			WRITE_ONCE(txd->txd4, fport);





			tx_buf->skb = (struct sk_buff *)MTK_DMA_DUMMY_DESC;

			tx_buf->skb = (struct sk_buff *)MTK_DMA_DUMMY_DESC;

			tx_buf = mtk_desc_to_tx_buf(ring, txd);

			tx_buf = mtk_desc_to_tx_buf(ring, txd);