Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc architecture updates from Helge Deller:
- Temporarily disable jump label support to avoid kernel crash with
32-bit kernel
- Add vdso linker script to 'targets' instead of extra-y
- Remove parisc versions of memcpy_toio and memset_io
* tag 'parisc-for-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Temporarily disable jump label support
parisc: add vdso linker script to 'targets' instead of extra-y
parisc: Remove memcpy_toio and memset_io
+4
-57
+2
-2
arch/parisc/Kconfig
+2
-2
arch/parisc/Kconfig
···
60
60
select HAVE_ARCH_MMAP_RND_BITS
61
61
select HAVE_ARCH_AUDITSYSCALL
62
62
select HAVE_ARCH_HASH
63
-
select HAVE_ARCH_JUMP_LABEL
64
-
select HAVE_ARCH_JUMP_LABEL_RELATIVE
63
+
# select HAVE_ARCH_JUMP_LABEL
64
+
# select HAVE_ARCH_JUMP_LABEL_RELATIVE
65
65
select HAVE_ARCH_KFENCE
66
66
select HAVE_ARCH_SECCOMP_FILTER
67
67
select HAVE_ARCH_TRACEHOOK
-4
arch/parisc/include/asm/io.h
-4
arch/parisc/include/asm/io.h
···
135
135
136
136
#define pci_iounmap pci_iounmap
137
137
138
-
void memset_io(volatile void __iomem *addr, unsigned char val, int count);
139
138
void memcpy_fromio(void *dst, const volatile void __iomem *src, int count);
140
-
void memcpy_toio(volatile void __iomem *dst, const void *src, int count);
141
-
#define memset_io memset_io
142
139
#define memcpy_fromio memcpy_fromio
143
-
#define memcpy_toio memcpy_toio
144
140
145
141
/* Port-space IO */
146
142
-2
arch/parisc/kernel/parisc_ksyms.c
-2
arch/parisc/kernel/parisc_ksyms.c
+1
-1
arch/parisc/kernel/vdso32/Makefile
+1
-1
arch/parisc/kernel/vdso32/Makefile
+1
-1
arch/parisc/kernel/vdso64/Makefile
+1
-1
arch/parisc/kernel/vdso64/Makefile
-47
arch/parisc/lib/io.c
-47
arch/parisc/lib/io.c
···
12
12
#include <linux/module.h>
13
13
#include <asm/io.h>
14
14
15
-
/* Copies a block of memory to a device in an efficient manner.
16
-
* Assumes the device can cope with 32-bit transfers. If it can't,
17
-
* don't use this function.
18
-
*/
19
-
void memcpy_toio(volatile void __iomem *dst, const void *src, int count)
20
-
{
21
-
if (((unsigned long)dst & 3) != ((unsigned long)src & 3))
22
-
goto bytecopy;
23
-
while ((unsigned long)dst & 3) {
24
-
writeb(*(char *)src, dst++);
25
-
src++;
26
-
count--;
27
-
}
28
-
while (count > 3) {
29
-
__raw_writel(*(u32 *)src, dst);
30
-
src += 4;
31
-
dst += 4;
32
-
count -= 4;
33
-
}
34
-
bytecopy:
35
-
while (count--) {
36
-
writeb(*(char *)src, dst++);
37
-
src++;
38
-
}
39
-
}
40
-
41
15
/*
42
16
** Copies a block of memory from a device in an efficient manner.
43
17
** Assumes the device can cope with 32-bit transfers. If it can't,
···
70
96
*(char *)dst = readb(src);
71
97
src++;
72
98
dst++;
73
-
}
74
-
}
75
-
76
-
/* Sets a block of memory on a device to a given value.
77
-
* Assumes the device can cope with 32-bit transfers. If it can't,
78
-
* don't use this function.
79
-
*/
80
-
void memset_io(volatile void __iomem *addr, unsigned char val, int count)
81
-
{
82
-
u32 val32 = (val << 24) | (val << 16) | (val << 8) | val;
83
-
while ((unsigned long)addr & 3) {
84
-
writeb(val, addr++);
85
-
count--;
86
-
}
87
-
while (count > 3) {
88
-
__raw_writel(val32, addr);
89
-
addr += 4;
90
-
count -= 4;
91
-
}
92
-
while (count--) {
93
-
writeb(val, addr++);
94
99
}
95
100
}
96
101