csky: 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 csky processor architecture.

Acked-by: Guo Ren <guoren@kernel.org>
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/csky/include/asm/io.h b/arch/csky/include/asm/io.h
index 4725bb977b0f4ff5edc30fb46bf8e4ea265f145a..ed53f0b47388088d84eb55253039164e698b9dc4 100644 (file)
--- a/arch/csky/include/asm/io.h
+++ b/arch/csky/include/asm/io.h
@@ -31,17 +31,6 @@
 #define writel(v,c)            ({ wmb(); writel_relaxed((v),(c)); mb(); })
 #endif
 
-/*
- * 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))
-
 /*
  * I/O memory mapping functions.
  */

diff --git a/arch/csky/kernel/Makefile b/arch/csky/kernel/Makefile
index 8a868316b912bfbb387b7ed6b0a94c1e15367410..de1c3472e8f07afe0a025ad8cd3996d7ffdfaa84 100644 (file)
--- a/arch/csky/kernel/Makefile
+++ b/arch/csky/kernel/Makefile
@@ -2,7 +2,7 @@
 extra-y := vmlinux.lds
 
 obj-y += head.o entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vdso/
-obj-y += power.o syscall.o syscall_table.o setup.o io.o
+obj-y += power.o syscall.o syscall_table.o setup.o
 obj-y += process.o cpu-probe.o ptrace.o stacktrace.o
 obj-y += probes/
 

diff --git a/arch/csky/kernel/io.c b/arch/csky/kernel/io.c
deleted file mode 100644 (file)
index 5883f13..0000000
--- a/arch/csky/kernel/io.c
+++ /dev/null
@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <linux/export.h>
-#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, 4)) {
-               *(u8 *)to = __raw_readb(from);
-               from++;
-               to++;
-               count--;
-       }
-
-       while (count >= 4) {
-               *(u32 *)to = __raw_readl(from);
-               from += 4;
-               to += 4;
-               count -= 4;
-       }
-
-       while (count) {
-               *(u8 *)to = __raw_readb(from);
-               from++;
-               to++;
-               count--;
-       }
-}
-EXPORT_SYMBOL(__memcpy_fromio);
-
-/*
- * 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, 4)) {
-               __raw_writeb(*(u8 *)from, to);
-               from++;
-               to++;
-               count--;
-       }
-
-       while (count >= 4) {
-               __raw_writel(*(u32 *)from, to);
-               from += 4;
-               to += 4;
-               count -= 4;
-       }
-
-       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)
-{
-       u32 qc = (u8)c;
-
-       qc |= qc << 8;
-       qc |= qc << 16;
-
-       while (count && !IS_ALIGNED((unsigned long)dst, 4)) {
-               __raw_writeb(c, dst);
-               dst++;
-               count--;
-       }
-
-       while (count >= 4) {
-               __raw_writel(qc, dst);
-               dst += 4;
-               count -= 4;
-       }
-
-       while (count) {
-               __raw_writeb(c, dst);
-               dst++;
-               count--;
-       }
-}
-EXPORT_SYMBOL(__memset_io);