diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-03-05 19:00:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-06 09:46:01 +0100 |
| commit | 89c670c9450002a4f7b73bf64d643b3c6d4498ba (patch) | |
| tree | 3204e0e4e2efd2c2a1f364ccd985e74442da35a0 /drivers/net/macb.c | |
| parent | f4b9f8a9afff83b084f93898d9c8297991187cf3 (diff) | |
| download | barebox-89c670c9450002a4f7b73bf64d643b3c6d4498ba.tar.gz barebox-89c670c9450002a4f7b73bf64d643b3c6d4498ba.tar.xz | |
macb: fix mmu support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index ea8ae82dfd..feffea5f09 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -50,6 +50,7 @@ #include <mach/board.h> #include <linux/clk.h> #include <linux/err.h> +#include <asm/mmu.h> #include "macb.h" @@ -118,6 +119,7 @@ static int macb_send(struct eth_device *edev, void *packet, macb->tx_ring[0].ctrl = ctrl; macb->tx_ring[0].addr = (ulong)packet; barrier(); + dma_flush_range((ulong) packet, (ulong)packet + length); writel(MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART), macb->regs + MACB_NCR); wait_on_timeout(100 * MSECOND, @@ -435,9 +437,9 @@ static int macb_probe(struct device_d *dev) macb->miidev.parent = dev; macb->flags = pdata->flags; - macb->rx_buffer = xmalloc(CFG_MACB_RX_BUFFER_SIZE); - macb->rx_ring = xmalloc(CFG_MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); - macb->tx_ring = xmalloc(sizeof(struct macb_dma_desc)); + macb->rx_buffer = dma_alloc_coherent(CFG_MACB_RX_BUFFER_SIZE); + macb->rx_ring = dma_alloc_coherent(CFG_MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc)); + macb->tx_ring = dma_alloc_coherent(sizeof(struct macb_dma_desc)); macb->regs = dev_request_mem_region(dev, 0); |