Skip to content

Commit

Permalink
asm-generic: io: Fix ioread16/32be and iowrite16/32be
Browse files Browse the repository at this point in the history
Fix ioreadXXbe and iowriteXXbe functions which did
additional little endian conversion on native big endian systems.
Using be_to_cpu (cpu_to_be) conversions with __raw_read/write
functions have resolved it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Will Deacon <will.deacon@arm.com>
CC: linux-arch@vger.kernel.org
  • Loading branch information
Michal Simek committed Feb 12, 2013
1 parent d64af91 commit 711e5b4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/asm-generic/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -225,15 +225,15 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
#ifndef CONFIG_GENERIC_IOMAP
#define ioread8(addr) readb(addr)
#define ioread16(addr) readw(addr)
#define ioread16be(addr) be16_to_cpu(ioread16(addr))
#define ioread16be(addr) __be16_to_cpu(__raw_readw(addr))
#define ioread32(addr) readl(addr)
#define ioread32be(addr) be32_to_cpu(ioread32(addr))
#define ioread32be(addr) __be32_to_cpu(__raw_readl(addr))

#define iowrite8(v, addr) writeb((v), (addr))
#define iowrite16(v, addr) writew((v), (addr))
#define iowrite16be(v, addr) iowrite16(be16_to_cpu(v), (addr))
#define iowrite16be(v, addr) __raw_writew(__cpu_to_be16(v), addr)
#define iowrite32(v, addr) writel((v), (addr))
#define iowrite32be(v, addr) iowrite32(be32_to_cpu(v), (addr))
#define iowrite32be(v, addr) __raw_writel(__cpu_to_be32(v), addr)

#define ioread8_rep(p, dst, count) \
insb((unsigned long) (p), (dst), (count))
Expand Down

0 comments on commit 711e5b4

Please sign in to comment.