702-v5.19-29-net-ethernet-mtk_eth_soc-convert-scratch_ring-pointe.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. From: Lorenzo Bianconi <[email protected]>
  2. Date: Fri, 20 May 2022 20:11:38 +0200
  3. Subject: [PATCH] net: ethernet: mtk_eth_soc: convert scratch_ring pointer to
  4. void
  5. Simplify the code converting scratch_ring pointer to void
  6. Signed-off-by: Lorenzo Bianconi <[email protected]>
  7. Signed-off-by: David S. Miller <[email protected]>
  8. ---
  9. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  10. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  11. @@ -933,7 +933,7 @@ static int mtk_init_fq_dma(struct mtk_et
  12. for (i = 0; i < cnt; i++) {
  13. struct mtk_tx_dma_v2 *txd;
  14. - txd = (void *)eth->scratch_ring + i * soc->txrx.txd_size;
  15. + txd = eth->scratch_ring + i * soc->txrx.txd_size;
  16. txd->txd1 = dma_addr + i * MTK_QDMA_PAGE_SIZE;
  17. if (i < cnt - 1)
  18. txd->txd2 = eth->phy_scratch_ring +
  19. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  20. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  21. @@ -1029,7 +1029,7 @@ struct mtk_eth {
  22. struct mtk_rx_ring rx_ring_qdma;
  23. struct napi_struct tx_napi;
  24. struct napi_struct rx_napi;
  25. - struct mtk_tx_dma *scratch_ring;
  26. + void *scratch_ring;
  27. dma_addr_t phy_scratch_ring;
  28. void *scratch_head;
  29. struct clk *clks[MTK_CLK_MAX];