]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtl818x: make sure TX descriptor writes are done before kicking DMA
authorandrea merello <andrea.merello@gmail.com>
Tue, 18 Feb 2014 01:10:46 +0000 (02:10 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Mar 2014 18:09:42 +0000 (13:09 -0500)
The TX descriptors are consumed by the HW using DMA.
Even if in the driver code the TX descriptor writes appears before
the HW "dma kick" register writes, the CPU may reorder them.

If this happens, the TX may not happen at all becase the "valid"
descriptor flag may have not been set yet.

This patch adds a write memory barrier to ensures the TX
descriptor is written before writing to the HW "dma kick" register.

Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl818x/rtl8180/dev.c

index 45d2cc14d71c59369eecc42f47ceb892178cdc42..959e699702e85076245c85d1fb6ac578a7254e7a 100644 (file)
@@ -341,6 +341,12 @@ static void rtl8180_tx(struct ieee80211_hw *dev,
         */
        wmb();
        entry->flags = cpu_to_le32(tx_flags);
+       /* We must be sure this has been written before followings HW
+        * register write, because this write will made the HW attempts
+        * to DMA the just-written data
+        */
+       wmb();
+
        __skb_queue_tail(&ring->queue, skb);
        if (ring->entries - skb_queue_len(&ring->queue) < 2)
                ieee80211_stop_queue(dev, prio);