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

Commit be293467 authored by Troy Kisky's avatar Troy Kisky Committed by David S. Miller
Browse files

net: fec: don't transfer ownership until descriptor write is complete 



If you don't own it, you shouldn't write to it.

Signed-off-by: default avatarTroy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80dc6a9f

drivers/net/ethernet/freescale/fec_main.c

+13 −1
Original line number Diff line number Diff line
@@ -390,6 +390,10 @@ fec_enet_txq_submit_frag_skb(struct fec_enet_priv_tx_q *txq, 


		bdp->cbd_bufaddr = cpu_to_fec32(addr);

		bdp->cbd_datlen = cpu_to_fec16(frag_len);

		/* Make sure the updates to rest of the descriptor are

		 * performed before transferring ownership.

		 */

		wmb();

		bdp->cbd_sc = cpu_to_fec16(status);

	}
@@ -499,6 +503,10 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, 


	bdp->cbd_datlen = cpu_to_fec16(buflen);

	bdp->cbd_bufaddr = cpu_to_fec32(addr);

	/* Make sure the updates to rest of the descriptor are performed before

	 * transferring ownership.

	 */

	wmb();



	/* Send it on its way.  Tell FEC it's ready, interrupt when done,

	 * it's the last BD of the frame, and to put the CRC on the end.
@@ -1475,7 +1483,6 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) 


		/* Mark the buffer empty */

		status |= BD_ENET_RX_EMPTY;

		bdp->cbd_sc = cpu_to_fec16(status);



		if (fep->bufdesc_ex) {

			struct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp;
@@ -1484,6 +1491,11 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) 
			ebdp->cbd_prot = 0;

			ebdp->cbd_bdu = 0;

		}

		/* Make sure the updates to rest of the descriptor are

		 * performed before transferring ownership.

		 */

		wmb();

		bdp->cbd_sc = cpu_to_fec16(status);



		/* Update BD pointer to next entry */

		bdp = fec_enet_get_nextdesc(bdp, &rxq->bd);