* [PATCH 1/2] ppc io.h: fix indentation @ 2013-05-30 15:17 Renaud Barbier 2013-05-30 15:17 ` [PATCH 2/2] ppc: update I/O accessors Renaud Barbier 2013-05-31 6:52 ` [PATCH 1/2] ppc io.h: fix indentation Sascha Hauer 0 siblings, 2 replies; 3+ messages in thread From: Renaud Barbier @ 2013-05-30 15:17 UTC (permalink / raw) To: barebox To prepare for an update of the I/O functions to the latest Linux version, the indentation is fixed. Signed-off-by: Renaud Barbier <renaud.barbier@ge.com> --- arch/ppc/include/asm/io.h | 48 ++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/ppc/include/asm/io.h b/arch/ppc/include/asm/io.h index 0052989..62e6de2 100644 --- a/arch/ppc/include/asm/io.h +++ b/arch/ppc/include/asm/io.h @@ -137,71 +137,71 @@ static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) */ extern inline int in_8(volatile u8 *addr) { - int ret; + int ret; - __asm__ __volatile__("lbz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); - return ret; + __asm__ __volatile__("lbz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); + return ret; } extern inline void out_8(volatile u8 *addr, int val) { - __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); } extern inline int in_le16(volatile u16 *addr) { - int ret; + int ret; - __asm__ __volatile__("lhbrx %0,0,%1; eieio" : "=r" (ret) : - "r" (addr), "m" (*addr)); - return ret; + __asm__ __volatile__("lhbrx %0,0,%1; eieio" : "=r" (ret) : + "r" (addr), "m" (*addr)); + return ret; } extern inline int in_be16(volatile u16 *addr) { - int ret; + int ret; - __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); - return ret; + __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); + return ret; } extern inline void out_le16(volatile u16 *addr, int val) { - __asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) : - "r" (val), "r" (addr)); + __asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) : + "r" (val), "r" (addr)); } extern inline void out_be16(volatile u16 *addr, int val) { - __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); } extern inline unsigned in_le32(volatile u32 *addr) { - unsigned ret; + unsigned ret; - __asm__ __volatile__("lwbrx %0,0,%1; eieio" : "=r" (ret) : - "r" (addr), "m" (*addr)); - return ret; + __asm__ __volatile__("lwbrx %0,0,%1; eieio" : "=r" (ret) : + "r" (addr), "m" (*addr)); + return ret; } extern inline unsigned in_be32(volatile u32 *addr) { - unsigned ret; + unsigned ret; - __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); - return ret; + __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); + return ret; } extern inline void out_le32(volatile unsigned *addr, int val) { - __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : - "r" (val), "r" (addr)); + __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : + "r" (val), "r" (addr)); } extern inline void out_be32(volatile unsigned *addr, int val) { - __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); + __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); } /* -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] ppc: update I/O accessors 2013-05-30 15:17 [PATCH 1/2] ppc io.h: fix indentation Renaud Barbier @ 2013-05-30 15:17 ` Renaud Barbier 2013-05-31 6:52 ` [PATCH 1/2] ppc io.h: fix indentation Sascha Hauer 1 sibling, 0 replies; 3+ messages in thread From: Renaud Barbier @ 2013-05-30 15:17 UTC (permalink / raw) To: barebox 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> --- 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 62e6de2..d3473e5 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)); } /* -- 1.7.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ppc io.h: fix indentation 2013-05-30 15:17 [PATCH 1/2] ppc io.h: fix indentation Renaud Barbier 2013-05-30 15:17 ` [PATCH 2/2] ppc: update I/O accessors Renaud Barbier @ 2013-05-31 6:52 ` Sascha Hauer 1 sibling, 0 replies; 3+ messages in thread From: Sascha Hauer @ 2013-05-31 6:52 UTC (permalink / raw) To: Renaud Barbier; +Cc: barebox Hi Renaud, On Thu, May 30, 2013 at 04:17:24PM +0100, Renaud Barbier wrote: > To prepare for an update of the I/O functions to the latest Linux > version, the indentation is fixed. > > Signed-off-by: Renaud Barbier <renaud.barbier@ge.com> Applied (both), thanks Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-31 6:53 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-05-30 15:17 [PATCH 1/2] ppc io.h: fix indentation Renaud Barbier 2013-05-30 15:17 ` [PATCH 2/2] ppc: update I/O accessors Renaud Barbier 2013-05-31 6:52 ` [PATCH 1/2] ppc io.h: fix indentation Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox