Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4661e75b authored by Sascha Hauer's avatar Sascha Hauer Committed by David S. Miller
Browse files

fec: use dma_alloc_coherent for descriptor ring 



Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6989f512

drivers/net/fec.c

+9 −5
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ struct fec_enet_private { 


	/* CPM dual port RAM relative addresses.

	*/

	dma_addr_t	bd_dma;

	cbd_t	*rx_bd_base;		/* Address of Rx and Tx buffers. */

	cbd_t	*tx_bd_base;

	cbd_t	*cur_rx, *cur_tx;		/* The next free ring entry */
@@ -2107,7 +2108,8 @@ int __init fec_enet_init(struct net_device *dev) 


	/* Allocate memory for buffer descriptors.

	*/

	mem_addr = __get_free_page(GFP_KERNEL);

	mem_addr = (unsigned long)dma_alloc_coherent(NULL, PAGE_SIZE,

			&fep->bd_dma, GFP_KERNEL);

	if (mem_addr == 0) {

		printk("FEC: allocate descriptor memory failed?\n");

		return -ENOMEM;
@@ -2202,8 +2204,9 @@ int __init fec_enet_init(struct net_device *dev) 


	/* Set receive and transmit descriptor base.

	*/

	fecp->fec_r_des_start = __pa((uint)(fep->rx_bd_base));

	fecp->fec_x_des_start = __pa((uint)(fep->tx_bd_base));

	fecp->fec_r_des_start = fep->bd_dma;

	fecp->fec_x_des_start = (unsigned long)fep->bd_dma + sizeof(cbd_t)

				* RX_RING_SIZE;



	/* Install our interrupt handlers. This varies depending on

	 * the architecture.
@@ -2291,8 +2294,9 @@ fec_restart(struct net_device *dev, int duplex) 


	/* Set receive and transmit descriptor base.

	*/

	fecp->fec_r_des_start = __pa((uint)(fep->rx_bd_base));

	fecp->fec_x_des_start = __pa((uint)(fep->tx_bd_base));

	fecp->fec_r_des_start = fep->bd_dma;

	fecp->fec_x_des_start = (unsigned long)fep->bd_dma + sizeof(cbd_t)

				* RX_RING_SIZE;



	fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;

	fep->cur_rx = fep->rx_bd_base;