diff options
author | Renaud Barbier <renaud.barbier@ge.com> | 2013-05-30 16:17:25 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-31 08:52:17 +0200 |
commit | e0594d51a33cf79af19259ec03f8294863ac5e32 (patch) | |
tree | ca6150d1694844054bd8f9f7c910379c22500215 /arch/ppc | |
parent | b73be000f35f0da881bb9070dea32e0a4ed3a180 (diff) | |
download | barebox-e0594d51a33cf79af19259ec03f8294863ac5e32.tar.gz barebox-e0594d51a33cf79af19259ec03f8294863ac5e32.tar.xz |
ppc: update I/O accessors
The I/O accessors in_bexx, out_bexx, in_lexx and out_lexx are updated
to the latest Linux version.
The patch is tested on a MPC8544 based board and solved I/O access
issues on I2C devices.
Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/include/asm/io.h | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/arch/ppc/include/asm/io.h b/arch/ppc/include/asm/io.h index 62e6de2d05..d3473e5c96 100644 --- a/arch/ppc/include/asm/io.h +++ b/arch/ppc/include/asm/io.h @@ -135,73 +135,76 @@ static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. */ -extern inline int in_8(volatile u8 *addr) +extern inline u8 in_8(const volatile u8 __iomem *addr) { - int ret; + u8 ret; - __asm__ __volatile__("lbz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); + __asm__ __volatile__("sync; lbz%U1%X1 %0,%1; twi 0,%0,0; isync" + : "=r" (ret) : "m" (*addr)); return ret; } -extern inline void out_8(volatile u8 *addr, int val) +extern inline void out_8(volatile u8 __iomem *addr, u8 val) { - __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("sync;stb%U0%X0 %1,%0" : "=m" (*addr) : "r" (val)); } -extern inline int in_le16(volatile u16 *addr) +extern inline u16 in_le16(const volatile u16 __iomem *addr) { - int ret; + u16 ret; - __asm__ __volatile__("lhbrx %0,0,%1; eieio" : "=r" (ret) : - "r" (addr), "m" (*addr)); + __asm__ __volatile__("sync; lhbrx %0,0,%1; twi 0,%0,0; isync" + : "=r" (ret) : "r" (addr), "m" (*addr)); return ret; } -extern inline int in_be16(volatile u16 *addr) +extern inline u16 in_be16(const volatile u16 __iomem *addr) { - int ret; + u16 ret; - __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); + __asm__ __volatile__("sync; lhz%U1%X1 %0,%1; twi 0,%0,0; isync" + : "=r" (ret) : "m" (*addr)); return ret; } -extern inline void out_le16(volatile u16 *addr, int val) +extern inline void out_le16(volatile u16 __iomem *addr, u16 val) { - __asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) : - "r" (val), "r" (addr)); + __asm__ __volatile__("sync; sthbrx %1,0,%2" + : "=m" (*addr) : "r" (val), "r" (addr)); } -extern inline void out_be16(volatile u16 *addr, int val) +extern inline void out_be16(volatile u16 __iomem *addr, u16 val) { - __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("sync;sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val)); } -extern inline unsigned in_le32(volatile u32 *addr) +extern inline u32 in_le32(const volatile u32 __iomem *addr) { - unsigned ret; + u32 ret; - __asm__ __volatile__("lwbrx %0,0,%1; eieio" : "=r" (ret) : - "r" (addr), "m" (*addr)); + __asm__ __volatile__("sync; lwbrx %0,0,%1; twi 0,%0,0; isync" + : "=r" (ret) : "r" (addr), "m" (*addr)); return ret; } -extern inline unsigned in_be32(volatile u32 *addr) +extern inline u32 in_be32(const volatile u32 __iomem *addr) { - unsigned ret; + u32 ret; - __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); + __asm__ __volatile__("sync; lwz%U1%X1 %0,%1; twi 0,%0,0; isync" + : "=r" (ret) : "m" (*addr)); return ret; } -extern inline void out_le32(volatile unsigned *addr, int val) +extern inline void out_le32(volatile u32 __iomem *addr, u32 val) { - __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : - "r" (val), "r" (addr)); + __asm__ __volatile__("sync; stwbrx %1,0,%2" + : "=m" (*addr) : "r" (val), "r" (addr)); } -extern inline void out_be32(volatile unsigned *addr, int val) +extern inline void out_be32(volatile u32 __iomem *addr, u32 val) { - __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("sync;stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val)); } /* |