0005-lantiq_etop-pass-struct-device-to-DMA-API-functions.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From 74e0deb89a8ba27c132b1f0e08643e215b5c1f92 Mon Sep 17 00:00:00 2001
  2. From: Christoph Hellwig <[email protected]>
  3. Date: Mon, 11 Feb 2019 14:20:00 +0100
  4. Subject: [PATCH] lantiq_etop: pass struct device to DMA API functions
  5. The DMA API generally relies on a struct device to work properly, and
  6. only barely works without one for legacy reasons. Pass the easily
  7. available struct device from the platform_device to remedy this.
  8. Note this driver seems to lack dma_unmap_* calls entirely, but fixing
  9. that is left for another time.
  10. Signed-off-by: Christoph Hellwig <[email protected]>
  11. Signed-off-by: David S. Miller <[email protected]>
  12. ---
  13. drivers/net/ethernet/lantiq_etop.c | 6 ++++--
  14. 1 file changed, 4 insertions(+), 2 deletions(-)
  15. --- a/drivers/net/ethernet/lantiq_etop.c
  16. +++ b/drivers/net/ethernet/lantiq_etop.c
  17. @@ -112,10 +112,12 @@ struct ltq_etop_priv {
  18. static int
  19. ltq_etop_alloc_skb(struct ltq_etop_chan *ch)
  20. {
  21. + struct ltq_etop_priv *priv = netdev_priv(ch->netdev);
  22. +
  23. ch->skb[ch->dma.desc] = netdev_alloc_skb(ch->netdev, MAX_DMA_DATA_LEN);
  24. if (!ch->skb[ch->dma.desc])
  25. return -ENOMEM;
  26. - ch->dma.desc_base[ch->dma.desc].addr = dma_map_single(NULL,
  27. + ch->dma.desc_base[ch->dma.desc].addr = dma_map_single(&priv->pdev->dev,
  28. ch->skb[ch->dma.desc]->data, MAX_DMA_DATA_LEN,
  29. DMA_FROM_DEVICE);
  30. ch->dma.desc_base[ch->dma.desc].addr =
  31. @@ -493,7 +495,7 @@ ltq_etop_tx(struct sk_buff *skb, struct
  32. netif_trans_update(dev);
  33. spin_lock_irqsave(&priv->lock, flags);
  34. - desc->addr = ((unsigned int) dma_map_single(NULL, skb->data, len,
  35. + desc->addr = ((unsigned int) dma_map_single(&priv->pdev->dev, skb->data, len,
  36. DMA_TO_DEVICE)) - byte_offset;
  37. wmb();
  38. desc->ctl = LTQ_DMA_OWN | LTQ_DMA_SOP | LTQ_DMA_EOP |