]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
typhoon: fix incorrect use of smp_wmb()
authorDavid Dillow <dave@thedillows.org>
Thu, 4 Mar 2010 04:37:16 +0000 (04:37 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Mar 2010 22:00:18 +0000 (14:00 -0800)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/typhoon.c

index e3ddcb8f29df39a5e45784b62f0ffe1b2cb15e7e..1cf012d3e072e000c9a8fefe2eb4f452a6fbdd23 100644 (file)
@@ -480,7 +480,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);
        }
@@ -1311,13 +1311,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