On Fri, Sep 6, 2024 at 7:47 PM Julian Vetter <jvetter@xxxxxxxxxxxxx> wrote:
>
> Use the generic __memcpy_{from,to}io and __memset_io for the csky
> processor architecture.
>
> Reviewed by: Yann Sionneau <ysionneau@xxxxxxxxxxxxx>
> Signed-off-by: Julian Vetter <jvetter@xxxxxxxxxxxxx>
I'm okay with moving it into GENERIC_IO
Acked-by: Guo Ren <guoren@xxxxxxxxxx>
> ---
> arch/csky/Kconfig | 1 +
> arch/csky/kernel/Makefile | 2 +-
> arch/csky/kernel/io.c | 91 ---------------------------------------
> 3 files changed, 2 insertions(+), 92 deletions(-)
> delete mode 100644 arch/csky/kernel/io.c
>
> diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
> index 5479707eb5d1..d64329b691f7 100644
> --- a/arch/csky/Kconfig
> +++ b/arch/csky/Kconfig
> @@ -48,6 +48,7 @@ config CSKY
> select DMA_DIRECT_REMAP
> select IRQ_DOMAIN
> select DW_APB_TIMER_OF
> + select GENERIC_IO
> select GENERIC_IOREMAP
> select GENERIC_LIB_ASHLDI3
> select GENERIC_LIB_ASHRDI3
> diff --git a/arch/csky/kernel/Makefile b/arch/csky/kernel/Makefile
> index 8a868316b912..de1c3472e8f0 100644
> --- 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
> index 5883f13fa2b1..000000000000
> --- 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);
> --
> 2.34.1
>
>
>
>
>
--
Best Regards
Guo Ren
