arm64: Use new fallback IO memcpy/memset

Use the new fallback memcpy_{from,to}io and memset_io functions from
lib/iomem_copy.c on the arm64 processor architecture.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com>
Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
index 1ada23a..463067b 100644 (file)
--- a/arch/arm64/include/asm/io.h
+++ b/arch/arm64/include/asm/io.h
@@ -128,17 +128,6 @@ static __always_inline u64 __raw_readq(const volatile void __iomem *addr)
 #define IO_SPACE_LIMIT         (PCI_IO_SIZE - 1)
 #define PCI_IOBASE             ((void __iomem *)PCI_IO_START)
 
-/*
- * String version of I/O memory access operations.
- */
-extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t);
-extern void __memcpy_toio(volatile void __iomem *, const void *, size_t);
-extern void __memset_io(volatile void __iomem *, int, size_t);
-
-#define memset_io(c,v,l)       __memset_io((c),(v),(l))
-#define memcpy_fromio(a,c,l)   __memcpy_fromio((a),(c),(l))
-#define memcpy_toio(c,a,l)     __memcpy_toio((c),(a),(l))
-
 /*
  * The ARM64 iowrite implementation is intended to support drivers that want to
  * use write combining. For instance PCI drivers using write combining with a 64

diff --git a/arch/arm64/kernel/io.c b/arch/arm64/kernel/io.c
index ef48089..fe86ada 100644 (file)
--- a/arch/arm64/kernel/io.c
+++ b/arch/arm64/kernel/io.c
@@ -9,34 +9,6 @@
 #include <linux/types.h>
 #include <linux/io.h>
 
-/*
- * Copy data from IO memory space to "real" memory space.
- */
-void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
-{
-       while (count && !IS_ALIGNED((unsigned long)from, 8)) {
-               *(u8 *)to = __raw_readb(from);
-               from++;
-               to++;
-               count--;
-       }
-
-       while (count >= 8) {
-               *(u64 *)to = __raw_readq(from);
-               from += 8;
-               to += 8;
-               count -= 8;
-       }
-
-       while (count) {
-               *(u8 *)to = __raw_readb(from);
-               from++;
-               to++;
-               count--;
-       }
-}
-EXPORT_SYMBOL(__memcpy_fromio);
-
 /*
  * This generates a memcpy that works on a from/to address which is aligned to
  * bits. Count is in terms of the number of bits sized quantities to copy. It
@@ -78,62 +50,3 @@ void __iowrite32_copy_full(void __iomem *to, const void *from, size_t count)
        dgh();
 }
 EXPORT_SYMBOL(__iowrite32_copy_full);
-
-/*
- * Copy data from "real" memory space to IO memory space.
- */
-void __memcpy_toio(volatile void __iomem *to, const void *from, size_t count)
-{
-       while (count && !IS_ALIGNED((unsigned long)to, 8)) {
-               __raw_writeb(*(u8 *)from, to);
-               from++;
-               to++;
-               count--;
-       }
-
-       while (count >= 8) {
-               __raw_writeq(*(u64 *)from, to);
-               from += 8;
-               to += 8;
-               count -= 8;
-       }
-
-       while (count) {
-               __raw_writeb(*(u8 *)from, to);
-               from++;
-               to++;
-               count--;
-       }
-}
-EXPORT_SYMBOL(__memcpy_toio);
-
-/*
- * "memset" on IO memory space.
- */
-void __memset_io(volatile void __iomem *dst, int c, size_t count)
-{
-       u64 qc = (u8)c;
-
-       qc |= qc << 8;
-       qc |= qc << 16;
-       qc |= qc << 32;
-
-       while (count && !IS_ALIGNED((unsigned long)dst, 8)) {
-               __raw_writeb(c, dst);
-               dst++;
-               count--;
-       }
-
-       while (count >= 8) {
-               __raw_writeq(qc, dst);
-               dst += 8;
-               count -= 8;
-       }
-
-       while (count) {
-               __raw_writeb(c, dst);
-               dst++;
-               count--;
-       }
-}
-EXPORT_SYMBOL(__memset_io);