leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] sky2: write barrier's

Browse Source 
Be more careful about memory barriers. The only place we really
need them is before and after updating the chip's ring interface.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Stephen Hemminger 2006-01-17 13:43:14 -08:00 committed by Jeff Garzik
parent 1c28f6ba60
commit 762c2de2e6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/sky2.c
View File

@ -707,6 +707,7 @@ static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2)
static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q,
u16 idx, u16 *last, u16 size) u16 idx, u16 *last, u16 size)
{ {
wmb();
if (is_ec_a1(hw) && idx < *last) { if (is_ec_a1(hw) && idx < *last) {
u16 hwget = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX)); u16 hwget = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX));
@ -730,6 +731,7 @@ setnew:
sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx); sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx);
} }
*last = idx; *last = idx;
mmiowb();
} }
@ -1253,7 +1255,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
out_unlock: out_unlock:
mmiowb();
spin_unlock(&sky2->tx_lock); spin_unlock(&sky2->tx_lock);
dev->trans_start = jiffies; dev->trans_start = jiffies;
@ -1896,7 +1897,6 @@ static int sky2_poll(struct net_device *dev0, int *budget)
exit_loop: exit_loop:
sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
mmiowb();
sky2_tx_check(hw, 0, tx_done[0]); sky2_tx_check(hw, 0, tx_done[0]);
sky2_tx_check(hw, 1, tx_done[1]); sky2_tx_check(hw, 1, tx_done[1]);
@ -1911,7 +1911,6 @@ exit_loop:
netif_rx_complete(dev0); netif_rx_complete(dev0);
hw->intr_mask |= Y2_IS_STAT_BMU; hw->intr_mask |= Y2_IS_STAT_BMU;
sky2_write32(hw, B0_IMSK, hw->intr_mask); sky2_write32(hw, B0_IMSK, hw->intr_mask);
mmiowb();
return 0; return 0;
} else { } else {
*budget -= work_done; *budget -= work_done;