Commit e3885f57 authored by Finn Thain's avatar Finn Thain Committed by David S. Miller

net/sonic: Use MMIO accessors

The driver accesses descriptor memory which is simultaneously accessed by
the chip, so the compiler must not be allowed to re-order CPU accesses.
sonic_buf_get() used 'volatile' to prevent that. sonic_buf_put() should
have done so too but was overlooked.

Fixes: efcce839 ("[PATCH] macsonic/jazzsonic network drivers update")
Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fedabf5
...@@ -345,30 +345,30 @@ static void sonic_msg_init(struct net_device *dev); ...@@ -345,30 +345,30 @@ static void sonic_msg_init(struct net_device *dev);
as far as we can tell. */ as far as we can tell. */
/* OpenBSD calls this "SWO". I'd like to think that sonic_buf_put() /* OpenBSD calls this "SWO". I'd like to think that sonic_buf_put()
is a much better name. */ is a much better name. */
static inline void sonic_buf_put(void* base, int bitmode, static inline void sonic_buf_put(u16 *base, int bitmode,
int offset, __u16 val) int offset, __u16 val)
{ {
if (bitmode) if (bitmode)
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
((__u16 *) base + (offset*2))[1] = val; __raw_writew(val, base + (offset * 2) + 1);
#else #else
((__u16 *) base + (offset*2))[0] = val; __raw_writew(val, base + (offset * 2) + 0);
#endif #endif
else else
((__u16 *) base)[offset] = val; __raw_writew(val, base + (offset * 1) + 0);
} }
static inline __u16 sonic_buf_get(void* base, int bitmode, static inline __u16 sonic_buf_get(u16 *base, int bitmode,
int offset) int offset)
{ {
if (bitmode) if (bitmode)
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
return ((volatile __u16 *) base + (offset*2))[1]; return __raw_readw(base + (offset * 2) + 1);
#else #else
return ((volatile __u16 *) base + (offset*2))[0]; return __raw_readw(base + (offset * 2) + 0);
#endif #endif
else else
return ((volatile __u16 *) base)[offset]; return __raw_readw(base + (offset * 1) + 0);
} }
/* Inlines that you should actually use for reading/writing DMA buffers */ /* Inlines that you should actually use for reading/writing DMA buffers */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment