arch: m32r: include: asm: add generic ioremap_wc() definition

add generic ioread*_rep() and iowrite*_rep(), or compiling failed.

The related error (with allmodconfig):

CC [M] drivers/mtd/nand/nand_base.o
drivers/mtd/nand/nand_base.c: In function ‘nand_write_buf’:
drivers/mtd/nand/nand_base.c:216:2: error: implicit declaration of function ‘iowrite8_rep’ [-Werror=implicit-function-declaration] drivers/mtd/nand/nand_base.c: In function ‘nand_read_buf’:
drivers/mtd/nand/nand_base.c:231:2: error: implicit declaration of function ‘ioread8_rep’ [-Werror=implicit-function-declaration] drivers/mtd/nand/nand_base.c: In function ‘nand_write_buf16’:
drivers/mtd/nand/nand_base.c:247:2: error: implicit declaration of function ‘iowrite16_rep’ [-Werror=implicit-function-declaration] drivers/mtd/nand/nand_base.c: In function ‘nand_read_buf16’:
drivers/mtd/nand/nand_base.c:263:2: error: implicit declaration of function ‘ioread16_rep’ [-Werror=implicit-function-declaration]

Signed-off-by Chen Gang <[email protected]>

---
 arch/m32r/include/asm/io.h |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

arch/m32r/include/asm/io.h +14 -0

index 4010f1f..167d6ed 100644
@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 
+#define ioread8_rep(p, dst, count) \
+	insb((unsigned long) (p), (dst), (count))
+#define ioread16_rep(p, dst, count) \
+	insw((unsigned long) (p), (dst), (count))
+#define ioread32_rep(p, dst, count) \
+	insl((unsigned long) (p), (dst), (count))
+
+#define iowrite8_rep(p, src, count) \
+	outsb((unsigned long) (p), (src), (count))
+#define iowrite16_rep(p, src, count) \
+	outsw((unsigned long) (p), (src), (count))
+#define iowrite32_rep(p, src, count) \
+	outsl((unsigned long) (p), (src), (count))
+
 #define mmiowb()
 
 #define flush_write_buffers() do { } while (0)  /* M32R_FIXME */

arch/m32r/include/asm/io.h static inline void _writel(unsigned long l, unsigned long addr) · line 173

Quoted 8 lines · Chen Gang

arch/m32r/include/asm/io.h +2 -0

@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 
+#define ioread8_rep(p, dst, count) \
+       insb((unsigned long) (p), (dst), (count))

As ioread8() is mapped to readb() (I/O memory space), not inb() (I/O port space),
ioread8_rep() should map to readsb() (which m32r doesn't have yet BTW), not insb().
For m32r this does matter, as inb() and readb() use different mechanisms internally.

It seems include/asm-generic/io.h also has this wrong?

Quoted 17 lines · On Thursday 27 June 2013 09:07:29 Geert Uytterhoeven wrote:

arch/m32r/include/asm/io.h static inline void _writel(unsigned long l, unsigned long addr) · line 173

Quoted 8 lines · Chen Gang

arch/m32r/include/asm/io.h +2 -0

@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 
+#define ioread8_rep(p, dst, count) \
+       insb((unsigned long) (p), (dst), (count))

As ioread8() is mapped to readb() (I/O memory space), not inb() (I/O port space),
ioread8_rep() should map to readsb() (which m32r doesn't have yet BTW), not insb().
For m32r this does matter, as inb() and readb() use different mechanisms internally.

Quoted 1 line

It seems include/asm-generic/io.h also has this wrong?

Yes, you are right. I thought we had fixed that long ago.

Does the patch below look ok to you? Note that none of the architectures using asm-generic/io.h supports PIO access and it works by chance this way, but we should definitely fix it.

Signed-off-by Arnd Bergmann <[email protected]>

Quoted 17 lines · On Thursday 27 June 2013 09:07:29 Geert Uytterhoeven wrote:

Quoted 17 lines · Chen Gang

Quoted 8 lines

arch/m32r/include/asm/io.h static inline void _writel(unsigned long l, unsigned long addr) · line 173

Quoted 8 lines

arch/m32r/include/asm/io.h +2 -0

@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 
+#define ioread8_rep(p, dst, count) \
+       insb((unsigned long) (p), (dst), (count))

As ioread8() is mapped to readb() (I/O memory space), not inb() (I/O port space),
ioread8_rep() should map to readsb() (which m32r doesn't have yet BTW), not insb().
For m32r this does matter, as inb() and readb() use different mechanisms internally.

Quoted 1 line

Quoted 1 line

It seems include/asm-generic/io.h also has this wrong?

Yes, you are right. I thought we had fixed that long ago.

Does the patch below look ok to you? Note that none of the architectures using asm-generic/io.h supports PIO access and it works by chance this way, but we should definitely fix it.

Signed-off-by Arnd Bergmann <[email protected]>

include/asm-generic/io.h +50 -50

index d5afe96..8af7a64 100644
@@ -161,108 +161,108 @@ static inline void outl(u32 b, unsigned long addr)
 #define outw_p(x, addr)	outw((x), (addr))
 #define outl_p(x, addr)	outl((x), (addr))
 
-#ifndef insb
-static inline void insb(unsigned long addr, void *buffer, int count)
+#ifndef CONFIG_GENERIC_IOMAP
+#define ioread8(addr)		readb(addr)
+#define ioread16(addr)		readw(addr)
+#define ioread16be(addr)	__be16_to_cpu(__raw_readw(addr))
+#define ioread32(addr)		readl(addr)
+#define ioread32be(addr)	__be32_to_cpu(__raw_readl(addr))
+
+#define iowrite8(v, addr)	writeb((v), (addr))
+#define iowrite16(v, addr)	writew((v), (addr))
+#define iowrite16be(v, addr)	__raw_writew(__cpu_to_be16(v), addr)
+#define iowrite32(v, addr)	writel((v), (addr))
+#define iowrite32be(v, addr)	__raw_writel(__cpu_to_be32(v), addr)
+
+static inline void ioread8_rep(void __iomem *addr, void *buffer, int count)
 {
 	if (count) {
 		u8 *buf = buffer;
 		do {
-			u8 x = __raw_readb(addr + PCI_IOBASE);
+			u8 x = __raw_readb(addr);
 			*buf++ = x;
 		} while (--count);
 	}
 }
-#endif
 
-#ifndef insw
-static inline void insw(unsigned long addr, void *buffer, int count)
+static inline void ioread16_rep(void __iomem *addr, void *buffer, int count)
 {
 	if (count) {
 		u16 *buf = buffer;
 		do {
-			u16 x = __raw_readw(addr + PCI_IOBASE);
+			u16 x = __raw_readw(addr);
 			*buf++ = x;
 		} while (--count);
 	}
 }
-#endif
 
-#ifndef insl
-static inline void insl(unsigned long addr, void *buffer, int count)
+static inline void ioread32_rep(void __iomem *addr, void *buffer, int count)
 {
 	if (count) {
 		u32 *buf = buffer;
 		do {
-			u32 x = __raw_readl(addr + PCI_IOBASE);
+			u32 x = __raw_readl(addr);
 			*buf++ = x;
 		} while (--count);
 	}
 }
-#endif
 
-#ifndef outsb
-static inline void outsb(unsigned long addr, const void *buffer, int count)
+static inline void iowrite8_rep(void __iomem *addr, const void *buffer, int count)
 {
 	if (count) {
 		const u8 *buf = buffer;
 		do {
-			__raw_writeb(*buf++, addr + PCI_IOBASE);
+			__raw_writeb(*buf++, addr);
 		} while (--count);
 	}
 }
-#endif
 
-#ifndef outsw
-static inline void outsw(unsigned long addr, const void *buffer, int count)
+static inline void iowrite16_rep(void __iomem *addr, const void *buffer, int count)
 {
 	if (count) {
 		const u16 *buf = buffer;
 		do {
-			__raw_writew(*buf++, addr + PCI_IOBASE);
+			__raw_writew(*buf++, addr);
 		} while (--count);
 	}
 }
-#endif
 
-#ifndef outsl
-static inline void outsl(unsigned long addr, const void *buffer, int count)
+static inline void iowrite32_rep(void __iomem *addr, const void *buffer, int count)
 {
 	if (count) {
 		const u32 *buf = buffer;
 		do {
-			__raw_writel(*buf++, addr + PCI_IOBASE);
+			__raw_writel(*buf++, addr);
 		} while (--count);
 	}
 }
-#endif
-
-#ifndef CONFIG_GENERIC_IOMAP
-#define ioread8(addr)		readb(addr)
-#define ioread16(addr)		readw(addr)
-#define ioread16be(addr)	__be16_to_cpu(__raw_readw(addr))
-#define ioread32(addr)		readl(addr)
-#define ioread32be(addr)	__be32_to_cpu(__raw_readl(addr))
+#endif /* CONFIG_GENERIC_IOMAP */
 
-#define iowrite8(v, addr)	writeb((v), (addr))
-#define iowrite16(v, addr)	writew((v), (addr))
-#define iowrite16be(v, addr)	__raw_writew(__cpu_to_be16(v), addr)
-#define iowrite32(v, addr)	writel((v), (addr))
-#define iowrite32be(v, addr)	__raw_writel(__cpu_to_be32(v), addr)
+#ifndef insb
+#define insb(a, dst, count) \
+	ioread8_rep((a) + PCI_IOBASE, (dst), (count))
+#endif
+#ifndef insw
+#define insw(a, dst, count) \
+	ioread16_rep((a) + PCI_IOBASE, (dst), (count))
+#endif
+#ifndef insl
+#define insl(a, dst, count) \
+	ioread32_rep((a) + PCI_IOBASE, (dst), (count))
+#endif
 
-#define ioread8_rep(p, dst, count) \
-	insb((unsigned long) (p), (dst), (count))
-#define ioread16_rep(p, dst, count) \
-	insw((unsigned long) (p), (dst), (count))
-#define ioread32_rep(p, dst, count) \
-	insl((unsigned long) (p), (dst), (count))
-
-#define iowrite8_rep(p, src, count) \
-	outsb((unsigned long) (p), (src), (count))
-#define iowrite16_rep(p, src, count) \
-	outsw((unsigned long) (p), (src), (count))
-#define iowrite32_rep(p, src, count) \
-	outsl((unsigned long) (p), (src), (count))
-#endif /* CONFIG_GENERIC_IOMAP */
+#ifndef outsb
+#define outsb(a, src, count) \
+	iowrite8_rep((a) + PCI_IOBASE, (src), (count))
+#endif
+#ifndef outsw
+#define outsw(a, src, count) \
+	iowrite16_rep((a) + PCI_IOBASE, (src), (count))
+#endif
+#ifndef outsl
+#define outsl(a, src, count) \
+	iowrite32_rep((a) + PCI_IOBASE, (src), (count))
+#endif
 
 #ifndef IO_SPACE_LIMIT
 #define IO_SPACE_LIMIT 0xffff

Quoted 6 lines · Chen Gang

arch/m32r/include/asm/io.h +0 -0

@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 

arch/m32r/include/asm/io.h static inline void _writel(unsigned long l, unsigned long addr) · line 173

Quoted 2 lines

arch/m32r/include/asm/io.h +2 -0

+#define ioread8_rep(p, dst, count) \
+       insb((unsigned long) (p), (dst), (count))

As ioread8() is mapped to readb() (I/O memory space), not inb() (I/O port space),
ioread8_rep() should map to readsb() (which m32r doesn't have yet BTW), not insb().
For m32r this does matter, as inb() and readb() use different mechanisms internally.

It seems include/asm-generic/io.h also has this wrong?

Quoted 7 lines · Geert Uytterhoeven

Quoted 6 lines · Chen Gang

arch/m32r/include/asm/io.h +0 -0

@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 

Quoted 10 lines

arch/m32r/include/asm/io.h static inline void _writel(unsigned long l, unsigned long addr) · line 173

Quoted 2 lines

arch/m32r/include/asm/io.h +2 -0

+#define ioread8_rep(p, dst, count) \
+       insb((unsigned long) (p), (dst), (count))

As ioread8() is mapped to readb() (I/O memory space), not inb() (I/O port space),
ioread8_rep() should map to readsb() (which m32r doesn't have yet BTW), not insb().
For m32r this does matter, as inb() and readb() use different mechanisms internally.

Reasonable, but excuse me, I am not quite familiar with it, can any other members (or maintainer) to help implement it ?

Thanks firstly.

:-)

Quoted 2 lines

It seems include/asm-generic/io.h also has this wrong?

I think it need improvement, if readsb has been defined, it should use readsb() instead, or just use insb().

Quoted 26 lines · Chen Gang

Quoted 26 lines · Geert Uytterhoeven

Quoted 7 lines

Quoted 7 lines · Chen Gang

Quoted 6 lines

Quoted 6 lines

arch/m32r/include/asm/io.h +0 -0

@@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
 #define iowrite16 writew
 #define iowrite32 writel
 

Quoted 10 lines

Quoted 10 lines

Quoted 2 lines

arch/m32r/include/asm/io.h static inline void _writel(unsigned long l, unsigned long addr) · line 173

Quoted 2 lines

arch/m32r/include/asm/io.h +2 -0

+#define ioread8_rep(p, dst, count) \
+       insb((unsigned long) (p), (dst), (count))

As ioread8() is mapped to readb() (I/O memory space), not inb() (I/O port space),
ioread8_rep() should map to readsb() (which m32r doesn't have yet BTW), not insb().
For m32r this does matter, as inb() and readb() use different mechanisms internally.

Reasonable, but excuse me, I am not quite familiar with it, can any other members (or maintainer) to help implement it ?

Thanks firstly.

:-)

Quoted 5 lines

Quoted 5 lines

Quoted 2 lines

Quoted 2 lines

It seems include/asm-generic/io.h also has this wrong?

I think it need improvement, if readsb has been defined, it should use readsb() instead, or just use insb().

I think m32r can mostly use asm-generic/io.h.
I.e. arch/m32r/include/asm/io.h has to #define all the operations it implements itself, and defer the rest to asm-generic/io.h.