diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-06 17:56:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 21:10:27 -0500 |
commit | 156ca2bbf6503a02d7d6829886ce381d572de66e (patch) | |
tree | d0d3b4aa44b8d819fdd9c02be22b71e651a022c8 /arch/powerpc/include/asm | |
parent | 8cdd3a9261e8efe36aeb6c708edb76d7e2b5d13f (diff) |
powerpc: introduce asm/swab.h
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r-- | arch/powerpc/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/byteorder.h | 83 | ||||
-rw-r--r-- | arch/powerpc/include/asm/swab.h | 90 |
3 files changed, 93 insertions, 81 deletions
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 5ab7d7fe198c..9268602de5d0 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild | |||
@@ -35,3 +35,4 @@ unifdef-y += spu_info.h | |||
35 | unifdef-y += termios.h | 35 | unifdef-y += termios.h |
36 | unifdef-y += types.h | 36 | unifdef-y += types.h |
37 | unifdef-y += unistd.h | 37 | unifdef-y += unistd.h |
38 | unifdef-y += swab.h | ||
diff --git a/arch/powerpc/include/asm/byteorder.h b/arch/powerpc/include/asm/byteorder.h index d5de325472e9..5cca27a41532 100644 --- a/arch/powerpc/include/asm/byteorder.h +++ b/arch/powerpc/include/asm/byteorder.h | |||
@@ -8,86 +8,7 @@ | |||
8 | * 2 of the License, or (at your option) any later version. | 8 | * 2 of the License, or (at your option) any later version. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <asm/types.h> | 11 | #include <asm/swab.h> |
12 | #include <linux/compiler.h> | 12 | #include <linux/byteorder/big_endian.h> |
13 | |||
14 | #define __BIG_ENDIAN | ||
15 | |||
16 | #ifdef __GNUC__ | ||
17 | #ifdef __KERNEL__ | ||
18 | |||
19 | static __inline__ __u16 ld_le16(const volatile __u16 *addr) | ||
20 | { | ||
21 | __u16 val; | ||
22 | |||
23 | __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (addr), "m" (*addr)); | ||
24 | return val; | ||
25 | } | ||
26 | #define __arch_swab16p ld_le16 | ||
27 | |||
28 | static __inline__ void st_le16(volatile __u16 *addr, const __u16 val) | ||
29 | { | ||
30 | __asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr)); | ||
31 | } | ||
32 | |||
33 | static inline void __arch_swab16s(__u16 *addr) | ||
34 | { | ||
35 | st_le16(addr, *addr); | ||
36 | } | ||
37 | #define __arch_swab16s __arch_swab16s | ||
38 | |||
39 | static __inline__ __u32 ld_le32(const volatile __u32 *addr) | ||
40 | { | ||
41 | __u32 val; | ||
42 | |||
43 | __asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (addr), "m" (*addr)); | ||
44 | return val; | ||
45 | } | ||
46 | #define __arch_swab32p ld_le32 | ||
47 | |||
48 | static __inline__ void st_le32(volatile __u32 *addr, const __u32 val) | ||
49 | { | ||
50 | __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr)); | ||
51 | } | ||
52 | |||
53 | static inline void __arch_swab32s(__u32 *addr) | ||
54 | { | ||
55 | st_le32(addr, *addr); | ||
56 | } | ||
57 | #define __arch_swab32s __arch_swab32s | ||
58 | |||
59 | static inline __attribute_const__ __u16 __arch_swab16(__u16 value) | ||
60 | { | ||
61 | __u16 result; | ||
62 | |||
63 | __asm__("rlwimi %0,%1,8,16,23" | ||
64 | : "=r" (result) | ||
65 | : "r" (value), "0" (value >> 8)); | ||
66 | return result; | ||
67 | } | ||
68 | #define __arch_swab16 __arch_swab16 | ||
69 | |||
70 | static inline __attribute_const__ __u32 __arch_swab32(__u32 value) | ||
71 | { | ||
72 | __u32 result; | ||
73 | |||
74 | __asm__("rlwimi %0,%1,24,16,23\n\t" | ||
75 | "rlwimi %0,%1,8,8,15\n\t" | ||
76 | "rlwimi %0,%1,24,0,7" | ||
77 | : "=r" (result) | ||
78 | : "r" (value), "0" (value >> 24)); | ||
79 | return result; | ||
80 | } | ||
81 | #define __arch_swab32 __arch_swab32 | ||
82 | |||
83 | #endif /* __KERNEL__ */ | ||
84 | |||
85 | #ifndef __powerpc64__ | ||
86 | #define __SWAB_64_THRU_32__ | ||
87 | #endif /* __powerpc64__ */ | ||
88 | |||
89 | #endif /* __GNUC__ */ | ||
90 | |||
91 | #include <linux/byteorder.h> | ||
92 | 13 | ||
93 | #endif /* _ASM_POWERPC_BYTEORDER_H */ | 14 | #endif /* _ASM_POWERPC_BYTEORDER_H */ |
diff --git a/arch/powerpc/include/asm/swab.h b/arch/powerpc/include/asm/swab.h new file mode 100644 index 000000000000..ef824ae4b79c --- /dev/null +++ b/arch/powerpc/include/asm/swab.h | |||
@@ -0,0 +1,90 @@ | |||
1 | #ifndef _ASM_POWERPC_SWAB_H | ||
2 | #define _ASM_POWERPC_SWAB_H | ||
3 | |||
4 | /* | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License | ||
7 | * as published by the Free Software Foundation; either version | ||
8 | * 2 of the License, or (at your option) any later version. | ||
9 | */ | ||
10 | |||
11 | #include <asm/types.h> | ||
12 | #include <linux/compiler.h> | ||
13 | |||
14 | #ifdef __GNUC__ | ||
15 | |||
16 | #ifndef __powerpc64__ | ||
17 | #define __SWAB_64_THRU_32__ | ||
18 | #endif /* __powerpc64__ */ | ||
19 | |||
20 | #ifdef __KERNEL__ | ||
21 | |||
22 | static __inline__ __u16 ld_le16(const volatile __u16 *addr) | ||
23 | { | ||
24 | __u16 val; | ||
25 | |||
26 | __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (addr), "m" (*addr)); | ||
27 | return val; | ||
28 | } | ||
29 | #define __arch_swab16p ld_le16 | ||
30 | |||
31 | static __inline__ void st_le16(volatile __u16 *addr, const __u16 val) | ||
32 | { | ||
33 | __asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr)); | ||
34 | } | ||
35 | |||
36 | static inline void __arch_swab16s(__u16 *addr) | ||
37 | { | ||
38 | st_le16(addr, *addr); | ||
39 | } | ||
40 | #define __arch_swab16s __arch_swab16s | ||
41 | |||
42 | static __inline__ __u32 ld_le32(const volatile __u32 *addr) | ||
43 | { | ||
44 | __u32 val; | ||
45 | |||
46 | __asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (addr), "m" (*addr)); | ||
47 | return val; | ||
48 | } | ||
49 | #define __arch_swab32p ld_le32 | ||
50 | |||
51 | static __inline__ void st_le32(volatile __u32 *addr, const __u32 val) | ||
52 | { | ||
53 | __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr)); | ||
54 | } | ||
55 | |||
56 | static inline void __arch_swab32s(__u32 *addr) | ||
57 | { | ||
58 | st_le32(addr, *addr); | ||
59 | } | ||
60 | #define __arch_swab32s __arch_swab32s | ||
61 | |||
62 | static inline __attribute_const__ __u16 __arch_swab16(__u16 value) | ||
63 | { | ||
64 | __u16 result; | ||
65 | |||
66 | __asm__("rlwimi %0,%1,8,16,23" | ||
67 | : "=r" (result) | ||
68 | : "r" (value), "0" (value >> 8)); | ||
69 | return result; | ||
70 | } | ||
71 | #define __arch_swab16 __arch_swab16 | ||
72 | |||
73 | static inline __attribute_const__ __u32 __arch_swab32(__u32 value) | ||
74 | { | ||
75 | __u32 result; | ||
76 | |||
77 | __asm__("rlwimi %0,%1,24,16,23\n\t" | ||
78 | "rlwimi %0,%1,8,8,15\n\t" | ||
79 | "rlwimi %0,%1,24,0,7" | ||
80 | : "=r" (result) | ||
81 | : "r" (value), "0" (value >> 24)); | ||
82 | return result; | ||
83 | } | ||
84 | #define __arch_swab32 __arch_swab32 | ||
85 | |||
86 | #endif /* __KERNEL__ */ | ||
87 | |||
88 | #endif /* __GNUC__ */ | ||
89 | |||
90 | #endif /* _ASM_POWERPC_SWAB_H */ | ||