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

Commit 73f7375d authored by Esben Haabendal's avatar Esben Haabendal Committed by David S. Miller
Browse files

net: ll_temac: Enable DMA when ready, not before 



As soon as TAILDESCR_PTR is written, DMA transfers might start.
Let's ensure we are ready to receive DMA IRQ's before doing that.

Signed-off-by: default avatarEsben Haabendal <esben@geanix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e97a194

drivers/net/ethernet/xilinx/ll_temac_main.c

+10 −5
Original line number Diff line number Diff line
@@ -314,17 +314,21 @@ static int temac_dma_bd_init(struct net_device *ndev) 
		    CHNL_CTRL_IRQ_EN | CHNL_CTRL_IRQ_ERR_EN |

		    CHNL_CTRL_IRQ_DLY_EN | CHNL_CTRL_IRQ_COAL_EN);



	lp->dma_out(lp, RX_CURDESC_PTR,  lp->rx_bd_p);

	lp->dma_out(lp, RX_TAILDESC_PTR,

		       lp->rx_bd_p + (sizeof(*lp->rx_bd_v) * (RX_BD_NUM - 1)));

	lp->dma_out(lp, TX_CURDESC_PTR, lp->tx_bd_p);



	/* Init descriptor indexes */

	lp->tx_bd_ci = 0;

	lp->tx_bd_next = 0;

	lp->tx_bd_tail = 0;

	lp->rx_bd_ci = 0;



	/* Enable RX DMA transfers */

	wmb();

	lp->dma_out(lp, RX_CURDESC_PTR,  lp->rx_bd_p);

	lp->dma_out(lp, RX_TAILDESC_PTR,

		       lp->rx_bd_p + (sizeof(*lp->rx_bd_v) * (RX_BD_NUM - 1)));



	/* Prepare for TX DMA transfer */

	lp->dma_out(lp, TX_CURDESC_PTR, lp->tx_bd_p);



	return 0;



out:
@@ -789,6 +793,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
	skb_tx_timestamp(skb);



	/* Kick off the transfer */

	wmb();

	lp->dma_out(lp, TX_TAILDESC_PTR, tail_p); /* DMA start */



	return NETDEV_TX_OK;