[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1381499540-28794-15-git-send-email-matthew.leach@arm.com>
Date: Fri, 11 Oct 2013 14:52:20 +0100
From: Matthew Leach <matthew.leach@....com>
To: linux-arm-kernel@...ts.infradead.org
Cc: ankit.jindal@...aro.org, steve.mcintyre@...aro.org,
tushar.jagad@...aro.org, will.deacon@....com,
catalin.marinas@....com, <netdev@...r.kernel.org>,
Nicolas Pitre <nico@...xnic.net>,
"David S. Miller" <davem@...emloft.net>
Subject: [PATCH 14/14] net: smc91x: dont't use SMC_outw for fixing up halfword-aligned data
From: Will Deacon <will.deacon@....com>
SMC_outw invokes an endian-aware I/O accessor, which may change the data
endianness before writing to the device. This is not suitable for data
transfers where the memory buffer is simply a string of bytes that does
not require any byte-swapping.
This patches fixes the smc91x SMC_PUSH_DATA macro so that it uses the
string I/O accessor for outputting the leading or trailing halfwords on
halfword-aligned buffers.
Cc: <netdev@...r.kernel.org>
Cc: Nicolas Pitre <nico@...xnic.net>
Cc: David S. Miller <davem@...emloft.net>
Signed-off-by: Will Deacon <will.deacon@....com>
---
drivers/net/ethernet/smsc/smc91x.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 5730fe2..98eedb9 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -1124,8 +1124,7 @@ static const char * chip_ids[ 16 ] = {
void __iomem *__ioaddr = ioaddr; \
if (__len >= 2 && (unsigned long)__ptr & 2) { \
__len -= 2; \
- SMC_outw(*(u16 *)__ptr, ioaddr, \
- DATA_REG(lp)); \
+ SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \
__ptr += 2; \
} \
if (SMC_CAN_USE_DATACS && lp->datacs) \
@@ -1133,8 +1132,7 @@ static const char * chip_ids[ 16 ] = {
SMC_outsl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \
if (__len & 2) { \
__ptr += (__len & ~3); \
- SMC_outw(*((u16 *)__ptr), ioaddr, \
- DATA_REG(lp)); \
+ SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \
} \
} else if (SMC_16BIT(lp)) \
SMC_outsw(ioaddr, DATA_REG(lp), p, (l) >> 1); \
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists