Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
sparc64: remove byteshifting from out* helpers
__raw_write avoids the need to byteswap, as we are reading from a
host-endian area, just deref the pointers directly, taking care
of alignment.
As before, outsw must be called with a 2-byte aligned pointer.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by Harvey Harrison and committed by David S. Miller 1758ef68 60b82673
+47
-92
arch/sparc64/lib/PeeCeeI.c
+47
-92
arch/sparc64/lib/PeeCeeI.c
···
20
20
{
21
21
void __iomem *addr = (void __iomem *) __addr;
22
22
23
-
if (count) {
24
-
u16 *ps = (u16 *)src;
25
-
u32 *pi;
26
-
27
-
if (((u64)src) & 0x2) {
28
-
u16 val = le16_to_cpup(ps);
29
-
outw(val, addr);
30
-
ps++;
31
-
count--;
32
-
}
33
-
pi = (u32 *)ps;
34
-
while (count >= 2) {
35
-
u32 w = le32_to_cpup(pi);
36
-
37
-
pi++;
38
-
outw(w >> 0, addr);
39
-
outw(w >> 16, addr);
40
-
count -= 2;
41
-
}
42
-
ps = (u16 *)pi;
43
-
if (count) {
44
-
u16 val = le16_to_cpup(ps);
45
-
outw(val, addr);
46
-
}
23
+
while (count--) {
24
+
__raw_writew(*(u16 *)src, addr);
25
+
src += sizeof(u16);
47
26
}
48
27
}
49
28
50
29
void outsl(unsigned long __addr, const void *src, unsigned long count)
51
30
{
52
31
void __iomem *addr = (void __iomem *) __addr;
32
+
u32 l, l2;
53
33
54
-
if (count) {
55
-
if ((((u64)src) & 0x3) == 0) {
56
-
u32 *p = (u32 *)src;
57
-
while (count--) {
58
-
u32 val = cpu_to_le32p(p);
59
-
outl(val, addr);
60
-
p++;
61
-
}
62
-
} else {
63
-
u8 *pb;
64
-
u16 *ps = (u16 *)src;
65
-
u32 l = 0, l2;
66
-
u32 *pi;
34
+
if (!count)
35
+
return;
67
36
68
-
switch (((u64)src) & 0x3) {
69
-
case 0x2:
70
-
count -= 1;
71
-
l = cpu_to_le16p(ps) << 16;
72
-
ps++;
73
-
pi = (u32 *)ps;
74
-
while (count--) {
75
-
l2 = cpu_to_le32p(pi);
76
-
pi++;
77
-
outl(((l >> 16) | (l2 << 16)), addr);
78
-
l = l2;
79
-
}
80
-
ps = (u16 *)pi;
81
-
l2 = cpu_to_le16p(ps);
82
-
outl(((l >> 16) | (l2 << 16)), addr);
83
-
break;
84
-
85
-
case 0x1:
86
-
count -= 1;
87
-
pb = (u8 *)src;
88
-
l = (*pb++ << 8);
89
-
ps = (u16 *)pb;
90
-
l2 = cpu_to_le16p(ps);
91
-
ps++;
92
-
l |= (l2 << 16);
93
-
pi = (u32 *)ps;
94
-
while (count--) {
95
-
l2 = cpu_to_le32p(pi);
96
-
pi++;
97
-
outl(((l >> 8) | (l2 << 24)), addr);
98
-
l = l2;
99
-
}
100
-
pb = (u8 *)pi;
101
-
outl(((l >> 8) | (*pb << 24)), addr);
102
-
break;
103
-
104
-
case 0x3:
105
-
count -= 1;
106
-
pb = (u8 *)src;
107
-
l = (*pb++ << 24);
108
-
pi = (u32 *)pb;
109
-
while (count--) {
110
-
l2 = cpu_to_le32p(pi);
111
-
pi++;
112
-
outl(((l >> 24) | (l2 << 8)), addr);
113
-
l = l2;
114
-
}
115
-
ps = (u16 *)pi;
116
-
l2 = cpu_to_le16p(ps);
117
-
ps++;
118
-
pb = (u8 *)ps;
119
-
l2 |= (*pb << 16);
120
-
outl(((l >> 24) | (l2 << 8)), addr);
121
-
break;
122
-
}
37
+
switch (((unsigned long)src) & 0x3) {
38
+
case 0x0:
39
+
/* src is naturally aligned */
40
+
while (count--) {
41
+
__raw_writel(*(u32 *)src, addr);
42
+
src += sizeof(u32);
123
43
}
44
+
break;
45
+
case 0x2:
46
+
/* 2-byte alignment */
47
+
while (count--) {
48
+
l = (*(u16 *)src) << 16;
49
+
l |= *(u16 *)(src + sizeof(u16));
50
+
__raw_writel(l, addr);
51
+
src += sizeof(u32);
52
+
}
53
+
break;
54
+
case 0x1:
55
+
/* Hold three bytes in l each time, grab a byte from l2 */
56
+
l = (*(u8 *)src) << 24;
57
+
l |= (*(u16 *)(src + sizeof(u8))) << 8;
58
+
src += sizeof(u8) + sizeof(u16);
59
+
while (count--) {
60
+
l2 = *(u32 *)src;
61
+
l |= (l2 >> 24);
62
+
__raw_writel(l, addr);
63
+
l = l2 << 8;
64
+
src += sizeof(u32);
65
+
}
66
+
break;
67
+
case 0x3:
68
+
/* Hold a byte in l each time, grab 3 bytes from l2 */
69
+
l = (*(u8 *)src) << 24;
70
+
src += sizeof(u8);
71
+
while (count--) {
72
+
l2 = *(u32 *)src;
73
+
l |= (l2 >> 8);
74
+
__raw_writel(l, addr);
75
+
l = l2 << 24;
76
+
src += sizeof(u32);
77
+
}
78
+
break;
124
79
}
125
80
}
126
81