On Friday 26 September 2014 11:53:33 Will Deacon wrote: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > > Date: Fri, 26 Sep 2014 19:57:03 +1000 > > Subject: [PATCH] sparc: io: fix for asm-generic: io: implement relaxed > > accessor macros as conditional wrappers > > > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > > --- > > arch/sparc/include/asm/io.h | 11 ++++++----- > > 1 file changed, 6 insertions(+), 5 deletions(-) > > > > diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h > > index 493f22c4684f..79b167674010 100644 > > --- a/arch/sparc/include/asm/io.h > > +++ b/arch/sparc/include/asm/io.h > > @@ -1,10 +1,5 @@ > > #ifndef ___ASM_SPARC_IO_H > > #define ___ASM_SPARC_IO_H > > -#if defined(__sparc__) && defined(__arch64__) > > -#include <asm/io_64.h> > > -#else > > -#include <asm/io_32.h> > > -#endif > > > > /* > > * Defines used for both SPARC32 and SPARC64 > > @@ -19,6 +14,12 @@ > > #define writew_relaxed(__w, __addr) writew(__w, __addr) > > #define writel_relaxed(__l, __addr) writel(__l, __addr) > > > > +#if defined(__sparc__) && defined(__arch64__) > > +#include <asm/io_64.h> > > +#else > > +#include <asm/io_32.h> > > +#endif > > + > > This patch looks fine to me. Arnd, can you pick this up please? > Thanks, applied on top with Stephen's full report in the commit message and your Ack. If David and Sam prefer, I could also do the patch below instead. As sparc32 already uses the asm-generic header, it doesn't really need the extra definitions, and they essentially become sparc64-only. I've picked Stephen's version for now, since it's known to build in the configurations he tests and has Will's Ack. Arnd diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h index 493f22c4684f..f6902cf3cbe9 100644 --- a/arch/sparc/include/asm/io.h +++ b/arch/sparc/include/asm/io.h @@ -10,15 +10,6 @@ * Defines used for both SPARC32 and SPARC64 */ -/* Relaxed accessors for MMIO */ -#define readb_relaxed(__addr) readb(__addr) -#define readw_relaxed(__addr) readw(__addr) -#define readl_relaxed(__addr) readl(__addr) - -#define writeb_relaxed(__b, __addr) writeb(__b, __addr) -#define writew_relaxed(__w, __addr) writew(__w, __addr) -#define writel_relaxed(__l, __addr) writel(__l, __addr) - /* Big endian versions of memory read/write routines */ #define readb_be(__addr) __raw_readb(__addr) #define readw_be(__addr) __raw_readw(__addr) diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h index d50e6127325d..e03df49e0dd8 100644 --- a/arch/sparc/include/asm/io_64.h +++ b/arch/sparc/include/asm/io_64.h @@ -412,6 +412,15 @@ static inline void iounmap(volatile void __iomem *addr) #define iowrite32(val,X) writel(val,X) #define iowrite32be(val,X) __raw_writel(val,X) +/* Relaxed accessors for MMIO */ +#define readb_relaxed(__addr) readb(__addr) +#define readw_relaxed(__addr) readw(__addr) +#define readl_relaxed(__addr) readl(__addr) + +#define writeb_relaxed(__b, __addr) writeb(__b, __addr) +#define writew_relaxed(__w, __addr) writew(__w, __addr) +#define writel_relaxed(__l, __addr) writel(__l, __addr) + /* Create a virtual mapping cookie for an IO port range */ void __iomem *ioport_map(unsigned long port, unsigned int nr); void ioport_unmap(void __iomem *); -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
