| Message ID | 20240925132420.821473-5-jvetter@kalrayinc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Consolidate IO memcpy functions | expand |
On Wed, Sep 25, 2024 at 9:24 PM Julian Vetter <jvetter@kalrayinc.com> wrote: > > Use the generic __memcpy_{from,to}io and __memset_io functions. > > Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com> > Signed-off-by: Julian Vetter <jvetter@kalrayinc.com> > --- > Changes for v6: > - Added proper commit header suffix: 'csky: ...' > --- > arch/csky/kernel/Makefile | 2 +- > arch/csky/kernel/io.c | 91 --------------------------------------- > 2 files changed, 1 insertion(+), 92 deletions(-) > delete mode 100644 arch/csky/kernel/io.c > > 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 > > > > > Thx for the clean-up. Acked-by: Guo Ren <guoren@kernel.org>
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);
Use the generic __memcpy_{from,to}io and __memset_io functions. Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com> Signed-off-by: Julian Vetter <jvetter@kalrayinc.com> --- Changes for v6: - Added proper commit header suffix: 'csky: ...' --- arch/csky/kernel/Makefile | 2 +- arch/csky/kernel/io.c | 91 --------------------------------------- 2 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 arch/csky/kernel/io.c