From: Arnd Bergmann <arnd@arndb.de>
To: Will Deacon <will.deacon@arm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: build failure after merge of the asm-generic tree
Date: Fri, 26 Sep 2014 13:14:45 +0200 [thread overview]
Message-ID: <6184197.FUKmdXcAaQ@wuerfel> (raw)
In-Reply-To: <20140926105333.GG22293@arm.com>
On Friday 26 September 2014 11:53:33 Will Deacon wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > 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@canb.auug.org.au>
> > ---
> > 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 *);
next prev parent reply other threads:[~2014-09-26 11:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 10:02 linux-next: build failure after merge of the asm-generic tree Stephen Rothwell
2014-09-26 10:53 ` Will Deacon
2014-09-26 11:14 ` Arnd Bergmann [this message]
2014-09-29 22:31 ` Stephen Rothwell
2014-09-30 10:00 ` Arnd Bergmann
2014-11-19 7:54 Stephen Rothwell
2014-11-19 9:21 ` Arnd Bergmann
2015-10-14 22:55 Stephen Rothwell
2015-10-14 23:32 ` kbuild test robot
2015-10-15 2:37 ` Stephen Rothwell
2018-03-15 22:13 Stephen Rothwell
2018-03-15 22:47 ` Bin Liu
2018-03-16 8:07 ` Arnd Bergmann
2019-02-19 6:36 Stephen Rothwell
2019-02-19 7:45 ` Hugo Lefeuvre
2019-02-19 10:14 ` Arnd Bergmann
2019-02-19 11:19 ` Hugo Lefeuvre
2019-02-19 14:42 ` Arnd Bergmann
2022-07-20 12:36 Stephen Rothwell
2022-07-20 12:51 ` Arnd Bergmann
2022-07-21 6:57 ` Lukas Bulwahn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6184197.FUKmdXcAaQ@wuerfel \
--to=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).