diff options
author | Michael Chan <mchan@broadcom.com> | 2012-03-04 09:48:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-04 20:39:31 -0500 |
commit | 6541b806b5f267eda8f127bb7f5fec4e7e4db995 (patch) | |
tree | 2415db513402df4b8c6a5f027a9045a80893b982 /drivers/net/ethernet/broadcom/tg3.c | |
parent | c441b456767357322dbc14b55bdc7da0051d0d98 (diff) |
tg3: Add memory barriers to sync BD data
for weak memory model architectures to ensure that the chip will DMA
valid BD data.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 4b3243b2bdf1..0da93dbbd0c8 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -5928,6 +5928,9 @@ next_pkt_nopost: | |||
5928 | 5928 | ||
5929 | /* Refill RX ring(s). */ | 5929 | /* Refill RX ring(s). */ |
5930 | if (!tg3_flag(tp, ENABLE_RSS)) { | 5930 | if (!tg3_flag(tp, ENABLE_RSS)) { |
5931 | /* Sync BD data before updating mailbox */ | ||
5932 | wmb(); | ||
5933 | |||
5931 | if (work_mask & RXD_OPAQUE_RING_STD) { | 5934 | if (work_mask & RXD_OPAQUE_RING_STD) { |
5932 | tpr->rx_std_prod_idx = std_prod_idx & | 5935 | tpr->rx_std_prod_idx = std_prod_idx & |
5933 | tp->rx_std_ring_mask; | 5936 | tp->rx_std_ring_mask; |
@@ -6970,6 +6973,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
6970 | skb_tx_timestamp(skb); | 6973 | skb_tx_timestamp(skb); |
6971 | netdev_sent_queue(tp->dev, skb->len); | 6974 | netdev_sent_queue(tp->dev, skb->len); |
6972 | 6975 | ||
6976 | /* Sync BD data before updating mailbox */ | ||
6977 | wmb(); | ||
6978 | |||
6973 | /* Packets are ready, update Tx producer idx local and on card. */ | 6979 | /* Packets are ready, update Tx producer idx local and on card. */ |
6974 | tw32_tx_mbox(tnapi->prodmbox, entry); | 6980 | tw32_tx_mbox(tnapi->prodmbox, entry); |
6975 | 6981 | ||
@@ -11763,6 +11769,9 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback) | |||
11763 | 11769 | ||
11764 | tnapi->tx_prod++; | 11770 | tnapi->tx_prod++; |
11765 | 11771 | ||
11772 | /* Sync BD data before updating mailbox */ | ||
11773 | wmb(); | ||
11774 | |||
11766 | tw32_tx_mbox(tnapi->prodmbox, tnapi->tx_prod); | 11775 | tw32_tx_mbox(tnapi->prodmbox, tnapi->tx_prod); |
11767 | tr32_mailbox(tnapi->prodmbox); | 11776 | tr32_mailbox(tnapi->prodmbox); |
11768 | 11777 | ||