diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-07 06:00:24 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 08:54:10 +0200 |
| commit | c2efd653368e483e0575f3bb345302e4365b5828 (patch) | |
| tree | 7f35eb4e1c1dd2a88410f77250c6e0077b89a421 /drivers/net/fec_imx.c | |
| parent | 04f922d6fc163d175748e248a17dbf1de6fc66c6 (diff) | |
| download | barebox-c2efd653368e483e0575f3bb345302e4365b5828.tar.gz barebox-c2efd653368e483e0575f3bb345302e4365b5828.tar.xz | |
net: fec_imx: Use dma mapping functions
Rather than doing DMA on the input buffer address get a proper DMA
address from the mapping functions.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/fec_imx.c')
| -rw-r--r-- | drivers/net/fec_imx.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 33599dd826..0ca5940821 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -453,6 +453,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) { unsigned int status; uint64_t tmo; + dma_addr_t dma; /* * This routine transmits one frame. This routine only accepts @@ -466,7 +467,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) return -1; } - if ((uint32_t)eth_data & (DB_DATA_ALIGNMENT-1)) + if ((unsigned long)eth_data & (DB_DATA_ALIGNMENT - 1)) dev_warn(&dev->dev, "Transmit data not aligned: %p!\n", eth_data); /* @@ -479,10 +480,12 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) writew(data_length, &fec->tbd_base[fec->tbd_index].data_length); - writel((uint32_t)(eth_data), &fec->tbd_base[fec->tbd_index].data_pointer); + dma = dma_map_single(fec->dev, eth_data, data_length, DMA_TO_DEVICE); + if (dma_mapping_error(fec->dev, dma)) + return -EIO; + + writel((uint32_t)(dma), &fec->tbd_base[fec->tbd_index].data_pointer); - dma_sync_single_for_device((unsigned long)eth_data, data_length, - DMA_TO_DEVICE); /* * update BD's status now * This block: @@ -505,8 +508,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) break; } } - dma_sync_single_for_cpu((unsigned long)eth_data, data_length, - DMA_TO_DEVICE); + dma_unmap_single(fec->dev, dma, data_length, DMA_TO_DEVICE); /* for next transmission use the other buffer */ if (fec->tbd_index) @@ -748,6 +750,7 @@ static int fec_probe(struct device_d *dev) fec = xzalloc(sizeof(*fec)); fec->type = type; + fec->dev = dev; edev = &fec->edev; dev->priv = fec; edev->priv = fec; |