From: Julian Vetter <julian@outer-limits.org>
To: Arnd Bergmann <arnd@arndb.de>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org,
Julian Vetter <julian@outer-limits.org>
Subject: [PATCH] sh: Remove IO memcpy and memset from sh code
Date: Tue, 28 Jan 2025 09:42:54 +0100 [thread overview]
Message-ID: <20250128084254.1408815-1-julian@outer-limits.org> (raw)
Remove IO memcpy and memset from sh specific code and fall back to the
new implementation from lib/iomem_copy.c. It uses word accesses if the
buffers are aligned and only falls back to byte accesses for potentially
unaligned parts of a buffer. Keep only the SH4 optimized memcpy_fromio.
Signed-off-by: Julian Vetter <julian@outer-limits.org>
---
arch/sh/include/asm/io.h | 8 ++----
arch/sh/kernel/io.c | 62 ++--------------------------------------
2 files changed, 6 insertions(+), 64 deletions(-)
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index cf5eab840d57..89a9b86bf844 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -269,12 +269,10 @@ __BUILD_IOPORT_STRING(q, u64)
#define IO_SPACE_LIMIT 0xffffffff
/* We really want to try and get these to memcpy etc */
-#define memset_io memset_io
+#ifdef CONFIG_CPU_SH4
#define memcpy_fromio memcpy_fromio
-#define memcpy_toio memcpy_toio
-void memcpy_fromio(void *, const volatile void __iomem *, unsigned long);
-void memcpy_toio(volatile void __iomem *, const void *, unsigned long);
-void memset_io(volatile void __iomem *, int, unsigned long);
+void memcpy_fromio(void *, const volatile void __iomem *, size_t);
+#endif
/* Quad-word real-mode I/O, don't ask.. */
unsigned long long peek_real_address_q(unsigned long long addr);
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index da22f3b32d30..a3e181643f75 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -5,21 +5,18 @@
* Copyright (C) 2000 - 2009 Stuart Menefy
* Copyright (C) 2005 Paul Mundt
*/
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <asm/machvec.h>
#include <asm/io.h>
/*
* Copy data from IO memory space to "real" memory space.
*/
-void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned long count)
+#ifdef CONFIG_CPU_SH4
+void memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
{
/*
* Would it be worthwhile doing byte and long transfers first
* to try and get aligned?
*/
-#ifdef CONFIG_CPU_SH4
if ((count >= 0x20) &&
(((u32)to & 0x1f) == 0) && (((u32)from & 0x3) == 0)) {
int tmp2, tmp3, tmp4, tmp5, tmp6;
@@ -53,59 +50,6 @@ void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned long co
: "7"(from), "0" (to), "1" (count)
: "r0", "r7", "t", "memory");
}
-#endif
-
- if ((((u32)to | (u32)from) & 0x3) == 0) {
- for (; count > 3; count -= 4) {
- *(u32 *)to = *(volatile u32 *)from;
- to += 4;
- from += 4;
- }
- }
-
- for (; count > 0; count--) {
- *(u8 *)to = *(volatile u8 *)from;
- to++;
- from++;
- }
-
- mb();
}
EXPORT_SYMBOL(memcpy_fromio);
-
-/*
- * Copy data from "real" memory space to IO memory space.
- */
-void memcpy_toio(volatile void __iomem *to, const void *from, unsigned long count)
-{
- if ((((u32)to | (u32)from) & 0x3) == 0) {
- for ( ; count > 3; count -= 4) {
- *(volatile u32 *)to = *(u32 *)from;
- to += 4;
- from += 4;
- }
- }
-
- for (; count > 0; count--) {
- *(volatile u8 *)to = *(u8 *)from;
- to++;
- from++;
- }
-
- mb();
-}
-EXPORT_SYMBOL(memcpy_toio);
-
-/*
- * "memset" on IO memory space.
- * This needs to be optimized.
- */
-void memset_io(volatile void __iomem *dst, int c, unsigned long count)
-{
- while (count) {
- count--;
- writeb(c, dst);
- dst++;
- }
-}
-EXPORT_SYMBOL(memset_io);
+#endif
--
2.34.1
next reply other threads:[~2025-01-28 8:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-28 8:42 Julian Vetter [this message]
2025-01-28 9:25 ` [PATCH] sh: Remove IO memcpy and memset from sh code Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250128084254.1408815-1-julian@outer-limits.org \
--to=julian@outer-limits.org \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).