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

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/loongarch/include/asm/io.h b/arch/loongarch/include/asm/io.h
index 5e95a60df1808aa294b791f12a8bfe3826059116..e77a56eaf90604e14c51b16430ba8f4f44ea360a 100644 (file)
--- a/arch/loongarch/include/asm/io.h
+++ b/arch/loongarch/include/asm/io.h
@@ -62,16 +62,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
 
 #define mmiowb() wmb()
 
-/*
- * String version of I/O memory access operations.
- */
-extern void __memset_io(volatile void __iomem *dst, int c, size_t count);
-extern void __memcpy_toio(volatile void __iomem *to, const void *from, size_t count);
-extern void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t count);
-#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))
-
 #define __io_aw() mmiowb()
 
 #ifdef CONFIG_KFENCE

diff --git a/arch/loongarch/kernel/Makefile b/arch/loongarch/kernel/Makefile
index c9bfeda89e4076ced15e168eaf07ba10e757155b..9497968ee158ff90196b29a71d1c0630f96162e9 100644 (file)
--- a/arch/loongarch/kernel/Makefile
+++ b/arch/loongarch/kernel/Makefile
@@ -8,7 +8,7 @@ OBJECT_FILES_NON_STANDARD_head.o := y
 extra-y                := vmlinux.lds
 
 obj-y          += head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \
-                  traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o switch.o \
+                  traps.o irq.o idle.o process.o dma.o mem.o reset.o switch.o \
                   elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o \
                   alternative.o unwind.o
 

diff --git a/arch/loongarch/kernel/io.c b/arch/loongarch/kernel/io.c
deleted file mode 100644 (file)
index cb85bda..0000000
--- a/arch/loongarch/kernel/io.c
+++ /dev/null
@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2020-2022 Loongson Technology Corporation Limited
- */
-#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, 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);
-
-/*
- * 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);