MIPS: Disable address swizzling on __raw MMIO operations
cover MIPS: Disable address swizzling on __raw MMIO operations
I have a big-endian MIPS32-based ASIC configured as follows:
CONFIG_SWAP_IO_SPACE is not set
mangle-port.h says:
#define __swizzle_addr_b(port) ((port) ^ 3)
#define __swizzle_addr_w(port) ((port) ^ 2)
#define __swizzle_addr_l(port) (port)
#define __swizzle_addr_q(port) (port)
(copied from mach-ip32/mangle-port.h)
The PCI drivers use {read,write}[bwl]. PCI byte and word (16-bit) accesses are address-swizzled but not endian-swapped. Since 32-bit accesses are the common case, this generates the most efficient code.
The MTD drivers (in my case, physmap) use __raw_{read,write}[bwl]. This is a problem because on MIPS, the __raw functions still enable address swizzling.
I am submitting a patch to disable address swizzling for the __raw operations.
There are currently three other MIPS platforms using address swizzling:
txx9/jmr3927 only uses the swizzle facility to make the rtc-ds1742 driver work. This driver uses standard (non-__raw) readb() operations, which will continue to function normally with my patch in place.
sgi-ip27 swizzles 16-bit PCI word addresses but not byte addresses. It only registers a single platform_device (rtc-m48t35) which has no __raw operations.
sgi-ip32 swizzles both 16-bit and 8-bit PCI addresses. It registers the following platform_device's:
8250 - uses standard read/write operations
meth - uses volatile struct accesses only
sgio2audio - uses readq/writeqsgi_btns - uses readq/writeqrtc_cmos - uses inb_p/outb_p
Based on this information, I do not believe that my change will have an adverse impact on any other systems.
PATCH 1/1 MIPS: Disable address swizzling on __raw MMIO operations
--- arch/mips/include/asm/io.h | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)
arch/mips/include/asm/io.h +13 -9
@@ -301,7 +301,7 @@ static inline void iounmap(const volatile void __iomem *addr)#define war_octeon_io_reorder_wmb () do { } while (0)#endif -#define __BUILD_MEMORY_SINGLE (pfx, bwlq, type, irq) \ +#define __BUILD_MEMORY_SINGLE (pfx, bwlq, type, irq, swiz) \ \ static inline void pfx##write##bwlq(type val, \ volatile void __iomem *mem) \
@@ -311,7 +311,9 @@ static inline void pfx##write##bwlq(type val, \ \war_octeon_io_reorder_wmb (); \ \ - __mem = (void *)__swizzle_addr_##bwlq((unsigned long)(mem)); \ + __mem = swiz ? \ + (void *)__swizzle_addr_##bwlq((unsigned long)(mem)) : \ + (void *)mem; \ \ __val = pfx##ioswab##bwlq(__mem, val); \ \
@@ -344,7 +346,9 @@ static inline type pfx##read##bwlq(const volatile void __iomem *mem) \volatile type *__mem; \type __val; \ \ - __mem = (void *)__swizzle_addr_##bwlq((unsigned long)(mem)); \ + __mem = swiz ? \ + (void *)__swizzle_addr_##bwlq((unsigned long)(mem)) : \ + (void *)mem; \ \ if (sizeof(type) != sizeof(u64) || sizeof(u64) == sizeof(long)) \ __val = *__mem; \
@@ -406,15 +410,15 @@ static inline type pfx##in##bwlq##p(unsigned long port) \ return pfx##ioswab##bwlq(__addr, __val); \ } -#define __BUILD_MEMORY_PFX (bus, bwlq, type) \ +#define __BUILD_MEMORY_PFX (bus, bwlq, type, swiz) \ \ -__BUILD_MEMORY_SINGLE(bus, bwlq, type, 1) +__BUILD_MEMORY_SINGLE(bus, bwlq, type, 1, swiz)#define BUILDIO_MEM (bwlq, type) \ \ -__BUILD_MEMORY_PFX(__raw_, bwlq, type) \ -__BUILD_MEMORY_PFX(, bwlq, type) \ -__BUILD_MEMORY_PFX(__mem_, bwlq, type) \ +__BUILD_MEMORY_PFX(__raw_, bwlq, type, 0) \ +__BUILD_MEMORY_PFX(, bwlq, type, 1) \ +__BUILD_MEMORY_PFX(__mem_, bwlq, type, 1) \ BUILDIO_MEM(b, u8)BUILDIO_MEM (w, u16)
@@ -438,7 +442,7 @@ BUILDIO_IOPORT(q, u64)#define __BUILDIO (bwlq, type) \ \ -__BUILD_MEMORY_SINGLE(____raw_, bwlq, type, 0) +__BUILD_MEMORY_SINGLE(____raw_, bwlq, type, 0, 0)__BUILDIO (q, u64)
Signature · 1 line
1.5.3.6