+Miquel who's in charge of the NAND tree for this release
On Wed, 11 Jul 2018 14:08:06 +0200
Arnd Bergmann <arnd@xxxxxxxx> wrote:
> Some drivers need these for compile-testing. On most architectures
> they come from asm-generic/io.h, but not on sparc64, which has its
> own definitions.
>
> Since we already have ioread*_rep()/iowrite*_rep() that have the
> same behavior on sparc64 (i.e. all PCI I/O space is memory mapped),
> we can rename the existing helpers and add macros to define them
> to the same implementation.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
I tried to compile a sparc64 kernel with COMPILE_TEST=y plus the
orion and s3c2410 NAND drivers enabled and it compiles fine (it does
without this patch). So it seems to fix the compilation error reported
by kbuild robots.
Tested-by: Boris Brezillon <boris.brezillon@bootlin>
(only compile-tested)
Dave gave his A-b, so, if everyone is okay with that, I'd like this
patch to go trough the NAND tree.
Thanks,
Boris
> ---
> arch/sparc/include/asm/io_64.h | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h
> index 9a1e9cbc7e6d..b162c23ae8c2 100644
> --- a/arch/sparc/include/asm/io_64.h
> +++ b/arch/sparc/include/asm/io_64.h
> @@ -243,35 +243,42 @@ void insb(unsigned long, void *, unsigned long);
> void insw(unsigned long, void *, unsigned long);
> void insl(unsigned long, void *, unsigned long);
>
> -static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count)
> +static inline void readsb(void __iomem *port, void *buf, unsigned long count)
> {
> insb((unsigned long __force)port, buf, count);
> }
> -static inline void ioread16_rep(void __iomem *port, void *buf, unsigned long count)
> +static inline void readsw(void __iomem *port, void *buf, unsigned long count)
> {
> insw((unsigned long __force)port, buf, count);
> }
>
> -static inline void ioread32_rep(void __iomem *port, void *buf, unsigned long count)
> +static inline void readsl(void __iomem *port, void *buf, unsigned long count)
> {
> insl((unsigned long __force)port, buf, count);
> }
>
> -static inline void iowrite8_rep(void __iomem *port, const void *buf, unsigned long count)
> +static inline void writesb(void __iomem *port, const void *buf, unsigned long count)
> {
> outsb((unsigned long __force)port, buf, count);
> }
>
> -static inline void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count)
> +static inline void writesw(void __iomem *port, const void *buf, unsigned long count)
> {
> outsw((unsigned long __force)port, buf, count);
> }
>
> -static inline void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count)
> +static inline void writesl(void __iomem *port, const void *buf, unsigned long count)
> {
> outsl((unsigned long __force)port, buf, count);
> }
>
> +#define ioread8_rep(p,d,l) readsb(p,d,l)
> +#define ioread16_rep(p,d,l) readsw(p,d,l)
> +#define ioread32_rep(p,d,l) readsl(p,d,l)
> +#define iowrite8_rep(p,d,l) writesb(p,d,l)
> +#define iowrite16_rep(p,d,l) writesw(p,d,l)
> +#define iowrite32_rep(p,d,l) writesl(p,d,l)
> +
> /* Valid I/O Space regions are anywhere, because each PCI bus supported
> * can live in an arbitrary area of the physical address range.
> */
--
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|