FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-14 08:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s2io: Update driver to use dma_wmb

Browse Source 
This change updates several spots where a wmb was being used to instead use
a dma_wmb to flush out writes before updating the control portion of the
descriptor.

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2015-04-07 16:55:21 -07:00 committed by David S. Miller
parent b4468cc6f2
commit 03cc864a25
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/neterion/s2io.c
View File

@ -2520,7 +2520,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
DBG_PRINT(INFO_DBG, "%s: Could not allocate skb\n", DBG_PRINT(INFO_DBG, "%s: Could not allocate skb\n",
ring->dev->name); ring->dev->name);
if (first_rxdp) { if (first_rxdp) {
wmb(); dma_wmb();
first_rxdp->Control_1 |= RXD_OWN_XENA; first_rxdp->Control_1 |= RXD_OWN_XENA;
} }
swstats->mem_alloc_fail_cnt++; swstats->mem_alloc_fail_cnt++;
@ -2634,7 +2634,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
rxdp->Control_2 |= SET_RXD_MARKER; rxdp->Control_2 |= SET_RXD_MARKER;
if (!(alloc_tab & ((1 << rxsync_frequency) - 1))) { if (!(alloc_tab & ((1 << rxsync_frequency) - 1))) {
if (first_rxdp) { if (first_rxdp) {
wmb(); dma_wmb();
first_rxdp->Control_1 |= RXD_OWN_XENA; first_rxdp->Control_1 |= RXD_OWN_XENA;
} }
first_rxdp = rxdp; first_rxdp = rxdp;
@ -2649,7 +2649,7 @@ end:
* and other fields are seen by adapter correctly. * and other fields are seen by adapter correctly.
*/ */
if (first_rxdp) { if (first_rxdp) {
wmb(); dma_wmb();
first_rxdp->Control_1 |= RXD_OWN_XENA; first_rxdp->Control_1 |= RXD_OWN_XENA;
} }
@ -6950,7 +6950,7 @@ static int rxd_owner_bit_reset(struct s2io_nic *sp)
} }
set_rxd_buffer_size(sp, rxdp, size); set_rxd_buffer_size(sp, rxdp, size);
wmb(); dma_wmb();
/* flip the Ownership bit to Hardware */ /* flip the Ownership bit to Hardware */
rxdp->Control_1 |= RXD_OWN_XENA; rxdp->Control_1 |= RXD_OWN_XENA;
} }