aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-06 17:58:41 -0500
committerBen Hutchings <bhutchings@solarflare.com>2010-12-06 17:58:41 -0500
commite506147271229d6c53b42c6a9897db67b5cfdb6d (patch)
treefc6f867fb38004dea15b5ba06b746e2895570181 /drivers/net
parent1a29cc40115c011895143c5f8278dee49423d5df (diff)
sfc: Remove locking from implementation of efx_writeo_paged()
It is not necessary to serialise writes to the paged 128-bit registers. However, if we don't then we must always write the last dword separately, not as part of a qword write. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sfc/io.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/net/sfc/io.h b/drivers/net/sfc/io.h
index 7f3adf29d6f6..6da4ae20a039 100644
--- a/drivers/net/sfc/io.h
+++ b/drivers/net/sfc/io.h
@@ -229,7 +229,20 @@ static inline void efx_readd_table(struct efx_nic *efx, efx_dword_t *value,
229static inline void _efx_writeo_page(struct efx_nic *efx, efx_oword_t *value, 229static inline void _efx_writeo_page(struct efx_nic *efx, efx_oword_t *value,
230 unsigned int reg, unsigned int page) 230 unsigned int reg, unsigned int page)
231{ 231{
232 efx_writeo(efx, value, EFX_PAGED_REG(page, reg)); 232 reg = EFX_PAGED_REG(page, reg);
233
234 netif_vdbg(efx, hw, efx->net_dev,
235 "writing register %x with " EFX_OWORD_FMT "\n", reg,
236 EFX_OWORD_VAL(*value));
237
238#ifdef EFX_USE_QWORD_IO
239 _efx_writeq(efx, value->u64[0], reg + 0);
240#else
241 _efx_writed(efx, value->u32[0], reg + 0);
242 _efx_writed(efx, value->u32[1], reg + 4);
243#endif
244 _efx_writed(efx, value->u32[2], reg + 8);
245 _efx_writed(efx, value->u32[3], reg + 12);
233} 246}
234#define efx_writeo_page(efx, value, reg, page) \ 247#define efx_writeo_page(efx, value, reg, page) \
235 _efx_writeo_page(efx, value, \ 248 _efx_writeo_page(efx, value, \