Commit d1ab1f54 authored by Uwe Kleine-König's avatar Uwe Kleine-König

net/fec: provide device for dma functions and matching sizes for map and unmap

This fixes warnings when CONFIG_DMA_API_DEBUG=y:

	NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x000000004781a020] [size=64 bytes]
	net eth0: DMA-API: device driver frees DMA memory with different size [device address=0x000000004781a020] [map size=2048 bytes] [unmap size=64 bytes]

Moreover pass the platform device to dma_{,un}map_single which makes
more sense because the logical network device doesn't know anything
about dma.

Passing the platform device was a suggestion by Lothar Waßmann.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 45993653
...@@ -297,7 +297,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -297,7 +297,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
/* Push the data cache so the CPM does not get stale memory /* Push the data cache so the CPM does not get stale memory
* data. * data.
*/ */
bdp->cbd_bufaddr = dma_map_single(&ndev->dev, bufaddr, bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, bufaddr,
FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE); FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
/* Send it on its way. Tell FEC it's ready, interrupt when done, /* Send it on its way. Tell FEC it's ready, interrupt when done,
...@@ -497,7 +497,8 @@ fec_enet_tx(struct net_device *ndev) ...@@ -497,7 +497,8 @@ fec_enet_tx(struct net_device *ndev)
if (bdp == fep->cur_tx && fep->tx_full == 0) if (bdp == fep->cur_tx && fep->tx_full == 0)
break; break;
dma_unmap_single(&ndev->dev, bdp->cbd_bufaddr, FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE); dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
bdp->cbd_bufaddr = 0; bdp->cbd_bufaddr = 0;
skb = fep->tx_skbuff[fep->skb_dirty]; skb = fep->tx_skbuff[fep->skb_dirty];
...@@ -624,8 +625,8 @@ fec_enet_rx(struct net_device *ndev) ...@@ -624,8 +625,8 @@ fec_enet_rx(struct net_device *ndev)
ndev->stats.rx_bytes += pkt_len; ndev->stats.rx_bytes += pkt_len;
data = (__u8*)__va(bdp->cbd_bufaddr); data = (__u8*)__va(bdp->cbd_bufaddr);
dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen, dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
DMA_FROM_DEVICE); FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
swap_buffer(data, pkt_len); swap_buffer(data, pkt_len);
...@@ -649,8 +650,8 @@ fec_enet_rx(struct net_device *ndev) ...@@ -649,8 +650,8 @@ fec_enet_rx(struct net_device *ndev)
netif_rx(skb); netif_rx(skb);
} }
bdp->cbd_bufaddr = dma_map_single(NULL, data, bdp->cbd_datlen, bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,
DMA_FROM_DEVICE); FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
rx_processing_done: rx_processing_done:
/* Clear the status flags for this buffer */ /* Clear the status flags for this buffer */
status &= ~BD_ENET_RX_STATS; status &= ~BD_ENET_RX_STATS;
...@@ -1075,7 +1076,7 @@ static void fec_enet_free_buffers(struct net_device *ndev) ...@@ -1075,7 +1076,7 @@ static void fec_enet_free_buffers(struct net_device *ndev)
skb = fep->rx_skbuff[i]; skb = fep->rx_skbuff[i];
if (bdp->cbd_bufaddr) if (bdp->cbd_bufaddr)
dma_unmap_single(&ndev->dev, bdp->cbd_bufaddr, dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
if (skb) if (skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -1103,7 +1104,7 @@ static int fec_enet_alloc_buffers(struct net_device *ndev) ...@@ -1103,7 +1104,7 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
} }
fep->rx_skbuff[i] = skb; fep->rx_skbuff[i] = skb;
bdp->cbd_bufaddr = dma_map_single(&ndev->dev, skb->data, bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, skb->data,
FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
bdp->cbd_sc = BD_ENET_RX_EMPTY; bdp->cbd_sc = BD_ENET_RX_EMPTY;
bdp++; bdp++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment