| Message ID | 1411579056-16966-2-git-send-email-will.deacon@arm.com |
|---|---|
| State | Accepted |
| Commit | 9439eb3ab9d1ece6e4ad7baaa4a7f534f9b9dab0 |
| Headers | show |
On Wednesday 24 September 2014 18:17:20 Will Deacon wrote: > {read,write}{b,w,l,q}_relaxed are implemented by some architectures in > order to permit memory-mapped I/O accesses with weaker barrier semantics > than the non-relaxed variants. > > This patch adds wrappers to asm-generic so that drivers can rely on the > relaxed accessors being available, even if they don't always provide > weaker ordering guarantees. Since some architectures both include > asm-generic/io.h and define some relaxed accessors, the definitions here > are conditional for the time being. > > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Will Deacon <will.deacon@arm.com> > --- > include/asm-generic/io.h | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > Acked-by: Arnd Bergmann <arnd@arndb.de> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Thu, Sep 25, 2014 at 11:32:00AM +0100, Arnd Bergmann wrote: > On Wednesday 24 September 2014 18:17:20 Will Deacon wrote: > > {read,write}{b,w,l,q}_relaxed are implemented by some architectures in > > order to permit memory-mapped I/O accesses with weaker barrier semantics > > than the non-relaxed variants. > > > > This patch adds wrappers to asm-generic so that drivers can rely on the > > relaxed accessors being available, even if they don't always provide > > weaker ordering guarantees. Since some architectures both include > > asm-generic/io.h and define some relaxed accessors, the definitions here > > are conditional for the time being. > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Will Deacon <will.deacon@arm.com> > > --- > > include/asm-generic/io.h | 26 ++++++++++++++++++++++++++ > > 1 file changed, 26 insertions(+) > > > > Acked-by: Arnd Bergmann <arnd@arndb.de> Thanks, Arnd. Do you have other patches queued for asm-generic, or shall I take this patch (on its own) via the arm64 tree? Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Thursday 25 September 2014 11:38:46 Will Deacon wrote: > On Thu, Sep 25, 2014 at 11:32:00AM +0100, Arnd Bergmann wrote: > > On Wednesday 24 September 2014 18:17:20 Will Deacon wrote: > > > {read,write}{b,w,l,q}_relaxed are implemented by some architectures in > > > order to permit memory-mapped I/O accesses with weaker barrier semantics > > > than the non-relaxed variants. > > > > > > This patch adds wrappers to asm-generic so that drivers can rely on the > > > relaxed accessors being available, even if they don't always provide > > > weaker ordering guarantees. Since some architectures both include > > > asm-generic/io.h and define some relaxed accessors, the definitions here > > > are conditional for the time being. > > > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > > Signed-off-by: Will Deacon <will.deacon@arm.com> > > > --- > > > include/asm-generic/io.h | 26 ++++++++++++++++++++++++++ > > > 1 file changed, 26 insertions(+) > > > > > > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Thanks, Arnd. Do you have other patches queued for asm-generic, or shall I > take this patch (on its own) via the arm64 tree? I don't have other patches queued up yet, but Thierry has another patch for asm-generic/io.h that I want to merge, so this time I'd prefer to take it through my tree in case there are conflicts. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Thu, Sep 25, 2014 at 11:43:41AM +0100, Arnd Bergmann wrote: > On Thursday 25 September 2014 11:38:46 Will Deacon wrote: > > On Thu, Sep 25, 2014 at 11:32:00AM +0100, Arnd Bergmann wrote: > > > On Wednesday 24 September 2014 18:17:20 Will Deacon wrote: > > > > {read,write}{b,w,l,q}_relaxed are implemented by some architectures in > > > > order to permit memory-mapped I/O accesses with weaker barrier semantics > > > > than the non-relaxed variants. > > > > > > > > This patch adds wrappers to asm-generic so that drivers can rely on the > > > > relaxed accessors being available, even if they don't always provide > > > > weaker ordering guarantees. Since some architectures both include > > > > asm-generic/io.h and define some relaxed accessors, the definitions here > > > > are conditional for the time being. > > > > > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > > > Signed-off-by: Will Deacon <will.deacon@arm.com> > > > > --- > > > > include/asm-generic/io.h | 26 ++++++++++++++++++++++++++ > > > > 1 file changed, 26 insertions(+) > > > > > > > > > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > > > Thanks, Arnd. Do you have other patches queued for asm-generic, or shall I > > take this patch (on its own) via the arm64 tree? > > I don't have other patches queued up yet, but Thierry has another patch > for asm-generic/io.h that I want to merge, so this time I'd prefer to > take it through my tree in case there are conflicts. Ok, suits me. I'll drop this from my series when it hits mainline. Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 975e1cc75edb..9ccedeb06522 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -53,18 +53,27 @@ static inline u32 __raw_readl(const volatile void __iomem *addr) #endif #define readb __raw_readb +#ifndef readb_relaxed +#define readb_relaxed readb +#endif #define readw readw static inline u16 readw(const volatile void __iomem *addr) { return __le16_to_cpu(__raw_readw(addr)); } +#ifndef readw_relaxed +#define readw_relaxed readw +#endif #define readl readl static inline u32 readl(const volatile void __iomem *addr) { return __le32_to_cpu(__raw_readl(addr)); } +#ifndef readl_relaxed +#define readl_relaxed readl +#endif #ifndef __raw_writeb static inline void __raw_writeb(u8 b, volatile void __iomem *addr) @@ -88,8 +97,19 @@ static inline void __raw_writel(u32 b, volatile void __iomem *addr) #endif #define writeb __raw_writeb +#ifndef writeb_relaxed +#define writeb_relaxed writeb +#endif + #define writew(b,addr) __raw_writew(__cpu_to_le16(b),addr) +#ifndef writew_relaxed +#define writew_relaxed writew +#endif + #define writel(b,addr) __raw_writel(__cpu_to_le32(b),addr) +#ifndef writel_relaxed +#define writel_relaxed writel +#endif #ifdef CONFIG_64BIT #ifndef __raw_readq @@ -104,6 +124,9 @@ static inline u64 readq(const volatile void __iomem *addr) { return __le64_to_cpu(__raw_readq(addr)); } +#ifndef readq_relaxed +#define readq_relaxed readq +#endif #ifndef __raw_writeq static inline void __raw_writeq(u64 b, volatile void __iomem *addr) @@ -113,6 +136,9 @@ static inline void __raw_writeq(u64 b, volatile void __iomem *addr) #endif #define writeq(b, addr) __raw_writeq(__cpu_to_le64(b), addr) +#ifndef writeq_relaxed +#define writeq_relaxed writeq +#endif #endif /* CONFIG_64BIT */ #ifndef PCI_IOBASE
{read,write}{b,w,l,q}_relaxed are implemented by some architectures in order to permit memory-mapped I/O accesses with weaker barrier semantics than the non-relaxed variants. This patch adds wrappers to asm-generic so that drivers can rely on the relaxed accessors being available, even if they don't always provide weaker ordering guarantees. Since some architectures both include asm-generic/io.h and define some relaxed accessors, the definitions here are conditional for the time being. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Will Deacon <will.deacon@arm.com> --- include/asm-generic/io.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)