diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-07 01:55:18 +0300 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-07 01:55:18 +0300 |
| commit | 494bdf1b0fd58688d055f1b66c34b0844dcfc1fa (patch) | |
| tree | b25bdaa90516813e19b5ee97de336da123f01bcd /drivers/net/sfc/io.h | |
| parent | 9f2f6cd07a09bc0af1f2950189e426569561d1e6 (diff) | |
| download | linux-494bdf1b0fd58688d055f1b66c34b0844dcfc1fa.tar.xz | |
sfc: Remove redundant memory barriers between MMIOs
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/sfc/io.h')
| -rw-r--r-- | drivers/net/sfc/io.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/sfc/io.h b/drivers/net/sfc/io.h index 0764e84ecc41..896b31e8606d 100644 --- a/drivers/net/sfc/io.h +++ b/drivers/net/sfc/io.h @@ -96,13 +96,11 @@ static inline void efx_writeo(struct efx_nic *efx, efx_oword_t *value, spin_lock_irqsave(&efx->biu_lock, flags); #ifdef EFX_USE_QWORD_IO _efx_writeq(efx, value->u64[0], reg + 0); - wmb(); _efx_writeq(efx, value->u64[1], reg + 8); #else _efx_writed(efx, value->u32[0], reg + 0); _efx_writed(efx, value->u32[1], reg + 4); _efx_writed(efx, value->u32[2], reg + 8); - wmb(); _efx_writed(efx, value->u32[3], reg + 12); #endif mmiowb(); @@ -125,7 +123,6 @@ static inline void efx_sram_writeq(struct efx_nic *efx, void __iomem *membase, __raw_writeq((__force u64)value->u64[0], membase + addr); #else __raw_writel((__force u32)value->u32[0], membase + addr); - wmb(); __raw_writel((__force u32)value->u32[1], membase + addr + 4); #endif mmiowb(); @@ -152,7 +149,6 @@ static inline void efx_reado(struct efx_nic *efx, efx_oword_t *value, spin_lock_irqsave(&efx->biu_lock, flags); value->u32[0] = _efx_readd(efx, reg + 0); - rmb(); value->u32[1] = _efx_readd(efx, reg + 4); value->u32[2] = _efx_readd(efx, reg + 8); value->u32[3] = _efx_readd(efx, reg + 12); @@ -175,7 +171,6 @@ static inline void efx_sram_readq(struct efx_nic *efx, void __iomem *membase, value->u64[0] = (__force __le64)__raw_readq(membase + addr); #else value->u32[0] = (__force __le32)__raw_readl(membase + addr); - rmb(); value->u32[1] = (__force __le32)__raw_readl(membase + addr + 4); #endif spin_unlock_irqrestore(&efx->biu_lock, flags); |