Skip to content

Commit 6ed5302

Browse files
author
Fox Snowpatch
committed
From patchwork series 427043
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=427043
1 parent f85c105 commit 6ed5302

File tree

27 files changed

+197
-399
lines changed

27 files changed

+197
-399
lines changed

‎arch/alpha/include/asm/io.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -591,13 +591,11 @@ extern inline u64 readq_relaxed(const volatile void __iomem *addr)
591591
/*
592592
* String version of IO memory access ops:
593593
*/
594-
extern void memcpy_fromio(void *, const volatile void __iomem *, long);
595-
extern void memcpy_toio(volatile void __iomem *, const void *, long);
596594
extern void _memset_c_io(volatile void __iomem *, unsigned long, long);
597595

598-
static inline void memset_io(volatile void __iomem *addr, u8 c, long len)
596+
static inline void memset_io(volatile void __iomem *dst, int c, size_t count)
599597
{
600-
_memset_c_io(addr, 0x0101010101010101UL * c, len);
598+
_memset_c_io(dst, 0x0101010101010101UL * (c & 0xff), count);
601599
}
602600

603601
#define __HAVE_ARCH_MEMSETW_IO

‎arch/alpha/kernel/io.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ EXPORT_SYMBOL(outsl);
481481
* Copy data from IO memory space to "real" memory space.
482482
* This needs to be optimized.
483483
*/
484-
void memcpy_fromio(void *to, const volatile void __iomem *from, long count)
484+
void memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
485485
{
486486
/* Optimize co-aligned transfers. Everything else gets handled
487487
a byte at a time. */
@@ -535,7 +535,7 @@ EXPORT_SYMBOL(memcpy_fromio);
535535
* Copy data from "real" memory space to IO memory space.
536536
* This needs to be optimized.
537537
*/
538-
void memcpy_toio(volatile void __iomem *to, const void *from, long count)
538+
void memcpy_toio(volatile void __iomem *to, const void *from, size_t count)
539539
{
540540
/* Optimize co-aligned transfers. Everything else gets handled
541541
a byte at a time. */

‎arch/arm/include/asm/io.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
298298
#define writesl(p,d,l) __raw_writesl(p,d,l)
299299

300300
#ifndef __ARMBE__
301-
static inline void memset_io(volatile void __iomem *dst, unsigned c,
301+
static inline void memset_io(volatile void __iomem *dst, int c,
302302
size_t count)
303303
{
304304
extern void mmioset(void *, unsigned int, size_t);

‎arch/arm64/include/asm/io.h

-11
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,6 @@ static __always_inline u64 __raw_readq(const volatile void __iomem *addr)
128128
#define IO_SPACE_LIMIT (PCI_IO_SIZE - 1)
129129
#define PCI_IOBASE ((void __iomem *)PCI_IO_START)
130130

131-
/*
132-
* String version of I/O memory access operations.
133-
*/
134-
extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t);
135-
extern void __memcpy_toio(volatile void __iomem *, const void *, size_t);
136-
extern void __memset_io(volatile void __iomem *, int, size_t);
137-
138-
#define memset_io(c,v,l) __memset_io((c),(v),(l))
139-
#define memcpy_fromio(a,c,l) __memcpy_fromio((a),(c),(l))
140-
#define memcpy_toio(c,a,l) __memcpy_toio((c),(a),(l))
141-
142131
/*
143132
* The ARM64 iowrite implementation is intended to support drivers that want to
144133
* use write combining. For instance PCI drivers using write combining with a 64

‎arch/arm64/kernel/io.c

-87
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,6 @@
99
#include <linux/types.h>
1010
#include <linux/io.h>
1111

12-
/*
13-
* Copy data from IO memory space to "real" memory space.
14-
*/
15-
void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
16-
{
17-
while (count && !IS_ALIGNED((unsigned long)from, 8)) {
18-
*(u8 *)to = __raw_readb(from);
19-
from++;
20-
to++;
21-
count--;
22-
}
23-
24-
while (count >= 8) {
25-
*(u64 *)to = __raw_readq(from);
26-
from += 8;
27-
to += 8;
28-
count -= 8;
29-
}
30-
31-
while (count) {
32-
*(u8 *)to = __raw_readb(from);
33-
from++;
34-
to++;
35-
count--;
36-
}
37-
}
38-
EXPORT_SYMBOL(__memcpy_fromio);
39-
4012
/*
4113
* This generates a memcpy that works on a from/to address which is aligned to
4214
* bits. Count is in terms of the number of bits sized quantities to copy. It
@@ -78,62 +50,3 @@ void __iowrite32_copy_full(void __iomem *to, const void *from, size_t count)
7850
dgh();
7951
}
8052
EXPORT_SYMBOL(__iowrite32_copy_full);
81-
82-
/*
83-
* Copy data from "real" memory space to IO memory space.
84-
*/
85-
void __memcpy_toio(volatile void __iomem *to, const void *from, size_t count)
86-
{
87-
while (count && !IS_ALIGNED((unsigned long)to, 8)) {
88-
__raw_writeb(*(u8 *)from, to);
89-
from++;
90-
to++;
91-
count--;
92-
}
93-
94-
while (count >= 8) {
95-
__raw_writeq(*(u64 *)from, to);
96-
from += 8;
97-
to += 8;
98-
count -= 8;
99-
}
100-
101-
while (count) {
102-
__raw_writeb(*(u8 *)from, to);
103-
from++;
104-
to++;
105-
count--;
106-
}
107-
}
108-
EXPORT_SYMBOL(__memcpy_toio);
109-
110-
/*
111-
* "memset" on IO memory space.
112-
*/
113-
void __memset_io(volatile void __iomem *dst, int c, size_t count)
114-
{
115-
u64 qc = (u8)c;
116-
117-
qc |= qc << 8;
118-
qc |= qc << 16;
119-
qc |= qc << 32;
120-
121-
while (count && !IS_ALIGNED((unsigned long)dst, 8)) {
122-
__raw_writeb(c, dst);
123-
dst++;
124-
count--;
125-
}
126-
127-
while (count >= 8) {
128-
__raw_writeq(qc, dst);
129-
dst += 8;
130-
count -= 8;
131-
}
132-
133-
while (count) {
134-
__raw_writeb(c, dst);
135-
dst++;
136-
count--;
137-
}
138-
}
139-
EXPORT_SYMBOL(__memset_io);

‎arch/csky/include/asm/io.h

-11
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,6 @@
3131
#define writel(v,c) ({ wmb(); writel_relaxed((v),(c)); mb(); })
3232
#endif
3333

34-
/*
35-
* String version of I/O memory access operations.
36-
*/
37-
extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t);
38-
extern void __memcpy_toio(volatile void __iomem *, const void *, size_t);
39-
extern void __memset_io(volatile void __iomem *, int, size_t);
40-
41-
#define memset_io(c,v,l) __memset_io((c),(v),(l))
42-
#define memcpy_fromio(a,c,l) __memcpy_fromio((a),(c),(l))
43-
#define memcpy_toio(c,a,l) __memcpy_toio((c),(a),(l))
44-
4534
/*
4635
* I/O memory mapping functions.
4736
*/

‎arch/csky/kernel/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
extra-y := vmlinux.lds
33

44
obj-y += head.o entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vdso/
5-
obj-y += power.o syscall.o syscall_table.o setup.o io.o
5+
obj-y += power.o syscall.o syscall_table.o setup.o
66
obj-y += process.o cpu-probe.o ptrace.o stacktrace.o
77
obj-y += probes/
88

‎arch/csky/kernel/io.c

-91
This file was deleted.

‎arch/loongarch/include/asm/io.h

-10
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
6262

6363
#define mmiowb() wmb()
6464

65-
/*
66-
* String version of I/O memory access operations.
67-
*/
68-
extern void __memset_io(volatile void __iomem *dst, int c, size_t count);
69-
extern void __memcpy_toio(volatile void __iomem *to, const void *from, size_t count);
70-
extern void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t count);
71-
#define memset_io(c, v, l) __memset_io((c), (v), (l))
72-
#define memcpy_fromio(a, c, l) __memcpy_fromio((a), (c), (l))
73-
#define memcpy_toio(c, a, l) __memcpy_toio((c), (a), (l))
74-
7565
#define __io_aw() mmiowb()
7666

7767
#ifdef CONFIG_KFENCE

‎arch/loongarch/kernel/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OBJECT_FILES_NON_STANDARD_head.o := y
88
extra-y := vmlinux.lds
99

1010
obj-y += head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \
11-
traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o switch.o \
11+
traps.o irq.o idle.o process.o dma.o mem.o reset.o switch.o \
1212
elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o \
1313
alternative.o unwind.o
1414

‎arch/loongarch/kernel/io.c

-94
This file was deleted.

0 commit comments

Comments
 (0)