summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-10 18:25:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-10 18:25:11 +0000
commitc4cdde2483e667146a76fe3e743f82cafb5c3567 (patch)
tree91b0a168edbbc1db2d8faf0324b5c613dbe606cb
parent9e4cc9c14e8705ac5b11d21f3eb88b589b55a907 (diff)
cns3xxx: fix ethernet driver memory barrier usage
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35941 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
index d554c40e7..7ffff684d 100644
--- a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
+++ b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
@@ -516,18 +516,20 @@ static void cns3xxx_alloc_rx_buf(struct sw *sw, int received)
for (received += rx_ring->alloc_count; received > 0; received--) {
buf = kzalloc(RX_SEGMENT_ALLOC_SIZE, GFP_ATOMIC);
if (!buf)
- goto out;
+ break;
phys = dma_map_single(NULL, buf + SKB_HEAD_ALIGN,
RX_SEGMENT_MRU, DMA_FROM_DEVICE);
if (dma_mapping_error(NULL, phys)) {
kfree(buf);
- goto out;
+ break;
}
desc->sdl = RX_SEGMENT_MRU;
desc->sdp = phys;
+ wmb();
+
/* put the new buffer on RX-free queue */
rx_ring->buff_tab[i] = buf;
rx_ring->phys_tab[i] = phys;
@@ -543,7 +545,7 @@ static void cns3xxx_alloc_rx_buf(struct sw *sw, int received)
desc++;
}
}
-out:
+
rx_ring->alloc_count = received;
rx_ring->alloc_index = i;
}
@@ -713,6 +715,7 @@ static int eth_poll(struct napi_struct *napi, int budget)
enable_irq(IRQ_CNS3XXX_SW_R0RXC);
}
+ wmb();
enable_rx_dma(sw);
spin_lock_bh(&tx_lock);
@@ -739,7 +742,7 @@ static void eth_set_desc(struct _tx_ring *tx_ring, int index, int index_last,
if (index == index_last)
config0 |= LAST_SEGMENT;
- mb();
+ wmb();
tx_desc->config0 = config0;
}
@@ -812,7 +815,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
eth_set_desc(tx_ring, index0, index_last, skb->data, len0,
config0 | FIRST_SEGMENT, pmap);
- mb();
+ wmb();
spin_lock(&tx_lock);
tx_ring->num_used += nr_desc + 1;