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

Commit eb0dc4bb authored by Shiraz Hashim's avatar Shiraz Hashim Committed by David S. Miller
Browse files

stmmac: add memory barriers at appropriate places 



This patch, provided by ST SPEAr developers,
has fixed a problem raised on ARM CA9 where
happened that the dma_transmission was enabled before
the dma descriptors were properly filled. To guarantee this
data memory barriers have been explicity used in the driver.

Signed-off-by: default avatarShiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bab632d6

drivers/net/stmmac/stmmac_main.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1045,6 +1045,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) 
					  len, DMA_TO_DEVICE);

					  len, DMA_TO_DEVICE);

		priv->tx_skbuff[entry] = NULL;

		priv->tx_skbuff[entry] = NULL;

		priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion);

		priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion);

		wmb();

		priv->hw->desc->set_tx_owner(desc);

		priv->hw->desc->set_tx_owner(desc);

	}

	}
@@ -1056,6 +1057,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (likely(priv->tm->enable))

	if (likely(priv->tm->enable))

		priv->hw->desc->clear_tx_ic(desc);

		priv->hw->desc->clear_tx_ic(desc);

#endif

#endif



	wmb();



	/* To avoid raise condition */

	/* To avoid raise condition */

	priv->hw->desc->set_tx_owner(first);

	priv->hw->desc->set_tx_owner(first);
@@ -1118,6 +1122,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) 
			}

			}

			RX_DBG(KERN_INFO "\trefill entry #%d\n", entry);

			RX_DBG(KERN_INFO "\trefill entry #%d\n", entry);

		}

		}

		wmb();

		priv->hw->desc->set_rx_owner(p + entry);

		priv->hw->desc->set_rx_owner(p + entry);

	}

	}

}

}