| Message ID | 1267713436.2328.12.camel@lap75545.ornl.gov |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: David Dillow <dave@thedillows.org> Date: Thu, 04 Mar 2010 09:37:16 -0500 > The typhoon driver was incorrectly using smp_wmb() to order memory > accesses against IO to the NIC in a few instances. Use wmb() instead, > which is required to actually order between memory types. > > Signed-off-by: David Dillow <dave@thedillows.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 39f1fc6..a192852 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -487,7 +487,7 @@ typhoon_hello(struct typhoon *tp) typhoon_inc_cmd_index(&ring->lastWrite, 1); INIT_COMMAND_NO_RESPONSE(cmd, TYPHOON_CMD_HELLO_RESP); - smp_wmb(); + wmb(); iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY); spin_unlock(&tp->command_lock); } @@ -1321,13 +1321,15 @@ typhoon_init_interface(struct typhoon *tp) tp->txlo_dma_addr = le32_to_cpu(iface->txLoAddr); tp->card_state = Sleeping; - smp_wmb(); tp->offload = TYPHOON_OFFLOAD_IP_CHKSUM | TYPHOON_OFFLOAD_TCP_CHKSUM; tp->offload |= TYPHOON_OFFLOAD_UDP_CHKSUM | TSO_OFFLOAD_ON; spin_lock_init(&tp->command_lock); spin_lock_init(&tp->state_lock); + + /* Force the writes to the shared memory area out before continuing. */ + wmb(); } static void
The typhoon driver was incorrectly using smp_wmb() to order memory accesses against IO to the NIC in a few instances. Use wmb() instead, which is required to actually order between memory types. Signed-off-by: David Dillow <dave@thedillows.org> --- This is against Linus's tree, which doesn't appear to have net-next in it yet. It should apply with offsets, though. I can redo against net-next if needed, but likely won't have quick access to that tree until the weekend. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html