Re: [PATCH 01/14] macb: fix mmu support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


On Mon, Mar 12, 2012 at 12:17:49PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>

We already have this one in master.

> ---
>  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 ab0d1af..48492e5 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);
>  
>  	if (ctrl & TXBUF_UNDERRUN)
> @@ -430,9 +432,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);
>  
> -- 
> 1.7.7
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox


[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux