* [PATCH 14/20] parisc: use the new byteorder headers
@ 2008-07-18 0:09 Harvey Harrison
2008-08-01 16:06 ` Grant Grundler
0 siblings, 1 reply; 6+ messages in thread
From: Harvey Harrison @ 2008-07-18 0:09 UTC (permalink / raw)
To: Andrew Morton; +Cc: Kyle McMartin, grundler, LKML
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
include/asm-parisc/byteorder.h | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/include/asm-parisc/byteorder.h b/include/asm-parisc/byteorder.h
index db14831..5e56b1b 100644
--- a/include/asm-parisc/byteorder.h
+++ b/include/asm-parisc/byteorder.h
@@ -4,9 +4,10 @@
#include <asm/types.h>
#include <linux/compiler.h>
-#ifdef __GNUC__
+#define __LITTLE_ENDIAN
+#define __SWAB_64_THRU_32__
-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
{
__asm__("dep %0, 15, 8, %0\n\t" /* deposit 00ab -> 0bab */
"shd %%r0, %0, 8, %0" /* shift 000000ab -> 00ba */
@@ -14,8 +15,9 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
: "0" (x));
return x;
}
+#define HAVE_ARCH_SWAB16
-static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
+static inline __attribute_const__ __u32 __arch_swab24(__u32 x)
{
__asm__("shd %0, %0, 8, %0\n\t" /* shift xabcxabc -> cxab */
"dep %0, 15, 8, %0\n\t" /* deposit cxab -> cbab */
@@ -25,7 +27,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
return x;
}
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
unsigned int temp;
__asm__("shd %0, %0, 16, %1\n\t" /* shift abcdabcd -> cdab */
@@ -35,7 +37,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
: "0" (x));
return x;
}
-
+#define HAVE_ARCH_SWAB32
#if BITS_PER_LONG > 32
/*
@@ -48,7 +50,8 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
** HSHR 67452301 -> *6*4*2*0 into %0
** OR %0 | %1 -> 76543210 into %0 (all done!)
*/
-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
+static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
+{
__u64 temp;
__asm__("permh,3210 %0, %0\n\t"
"hshl %0, 8, %1\n\t"
@@ -58,25 +61,9 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
: "0" (x));
return x;
}
-#define __arch__swab64(x) ___arch__swab64(x)
-#define __BYTEORDER_HAS_U64__
-#elif !defined(__STRICT_ANSI__)
-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
-{
- __u32 t1 = ___arch__swab32((__u32) x);
- __u32 t2 = ___arch__swab32((__u32) (x >> 32));
- return (((__u64) t1 << 32) | t2);
-}
-#define __arch__swab64(x) ___arch__swab64(x)
-#define __BYTEORDER_HAS_U64__
-#endif
-
-#define __arch__swab16(x) ___arch__swab16(x)
-#define __arch__swab24(x) ___arch__swab24(x)
-#define __arch__swab32(x) ___arch__swab32(x)
-
-#endif /* __GNUC__ */
+#define HAVE_ARCH_SWAB64
+#endif /* BITS_PER_LONG > 32 */
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>
#endif /* _PARISC_BYTEORDER_H */
--
1.5.6.3.569.ga9185
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 14/20] parisc: use the new byteorder headers
2008-07-18 0:09 [PATCH 14/20] parisc: use the new byteorder headers Harvey Harrison
@ 2008-08-01 16:06 ` Grant Grundler
2008-08-01 21:23 ` Harvey Harrison
0 siblings, 1 reply; 6+ messages in thread
From: Grant Grundler @ 2008-08-01 16:06 UTC (permalink / raw)
To: Harvey Harrison; +Cc: Andrew Morton, Kyle McMartin, grundler, LKML
On Thu, Jul 17, 2008 at 05:09:43PM -0700, Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
> include/asm-parisc/byteorder.h | 37 ++++++++++++-------------------------
> 1 files changed, 12 insertions(+), 25 deletions(-)
>
> diff --git a/include/asm-parisc/byteorder.h b/include/asm-parisc/byteorder.h
> index db14831..5e56b1b 100644
> --- a/include/asm-parisc/byteorder.h
> +++ b/include/asm-parisc/byteorder.h
> @@ -4,9 +4,10 @@
> #include <asm/types.h>
> #include <linux/compiler.h>
>
> -#ifdef __GNUC__
> +#define __LITTLE_ENDIAN
Sorry, this looks wrong. parisc is big endian.
> +#define __SWAB_64_THRU_32__
Should this only be defined if BITS_PER_LONG is <=32 ?
thanks,
grant
>
> -static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
> +static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
> {
> __asm__("dep %0, 15, 8, %0\n\t" /* deposit 00ab -> 0bab */
> "shd %%r0, %0, 8, %0" /* shift 000000ab -> 00ba */
> @@ -14,8 +15,9 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
> : "0" (x));
> return x;
> }
> +#define HAVE_ARCH_SWAB16
>
> -static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
> +static inline __attribute_const__ __u32 __arch_swab24(__u32 x)
> {
> __asm__("shd %0, %0, 8, %0\n\t" /* shift xabcxabc -> cxab */
> "dep %0, 15, 8, %0\n\t" /* deposit cxab -> cbab */
> @@ -25,7 +27,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
> return x;
> }
>
> -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
> +static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
> {
> unsigned int temp;
> __asm__("shd %0, %0, 16, %1\n\t" /* shift abcdabcd -> cdab */
> @@ -35,7 +37,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
> : "0" (x));
> return x;
> }
> -
> +#define HAVE_ARCH_SWAB32
>
> #if BITS_PER_LONG > 32
> /*
> @@ -48,7 +50,8 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
> ** HSHR 67452301 -> *6*4*2*0 into %0
> ** OR %0 | %1 -> 76543210 into %0 (all done!)
> */
> -static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
> +static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
> +{
> __u64 temp;
> __asm__("permh,3210 %0, %0\n\t"
> "hshl %0, 8, %1\n\t"
> @@ -58,25 +61,9 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
> : "0" (x));
> return x;
> }
> -#define __arch__swab64(x) ___arch__swab64(x)
> -#define __BYTEORDER_HAS_U64__
> -#elif !defined(__STRICT_ANSI__)
> -static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
> -{
> - __u32 t1 = ___arch__swab32((__u32) x);
> - __u32 t2 = ___arch__swab32((__u32) (x >> 32));
> - return (((__u64) t1 << 32) | t2);
> -}
> -#define __arch__swab64(x) ___arch__swab64(x)
> -#define __BYTEORDER_HAS_U64__
> -#endif
> -
> -#define __arch__swab16(x) ___arch__swab16(x)
> -#define __arch__swab24(x) ___arch__swab24(x)
> -#define __arch__swab32(x) ___arch__swab32(x)
> -
> -#endif /* __GNUC__ */
> +#define HAVE_ARCH_SWAB64
> +#endif /* BITS_PER_LONG > 32 */
>
> -#include <linux/byteorder/big_endian.h>
> +#include <linux/byteorder.h>
>
> #endif /* _PARISC_BYTEORDER_H */
> --
> 1.5.6.3.569.ga9185
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 14/20] parisc: use the new byteorder headers
2008-08-01 16:06 ` Grant Grundler
@ 2008-08-01 21:23 ` Harvey Harrison
2008-08-01 23:18 ` Grant Grundler
0 siblings, 1 reply; 6+ messages in thread
From: Harvey Harrison @ 2008-08-01 21:23 UTC (permalink / raw)
To: Grant Grundler; +Cc: Andrew Morton, Kyle McMartin, LKML
On Fri, 2008-08-01 at 10:06 -0600, Grant Grundler wrote:
> On Thu, Jul 17, 2008 at 05:09:43PM -0700, Harvey Harrison wrote:
> > Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> > ---
> > include/asm-parisc/byteorder.h | 37 ++++++++++++-------------------------
> > 1 files changed, 12 insertions(+), 25 deletions(-)
> >
> > diff --git a/include/asm-parisc/byteorder.h b/include/asm-parisc/byteorder.h
> > index db14831..5e56b1b 100644
> > --- a/include/asm-parisc/byteorder.h
> > +++ b/include/asm-parisc/byteorder.h
> > @@ -4,9 +4,10 @@
> > #include <asm/types.h>
> > #include <linux/compiler.h>
> >
> > -#ifdef __GNUC__
> > +#define __LITTLE_ENDIAN
>
> Sorry, this looks wrong. parisc is big endian.
Sorry, it is wrong. It of course should be __BIG_ENDIAN
> > +#define __SWAB_64_THRU_32__
>
> Should this only be defined if BITS_PER_LONG is <=32 ?
>
The new byteorder headers only uses this if no __arch_swab64 is defined.
Further down in the parisc version, an __arch_swab64 is defined in the
BITS_PER_LONG >=32 case, making this moot.
>From the new linux/swab.h:
static inline __attribute_const__ __u64 ___swab64(__u64 val)
{
#ifdef __arch_swab64
return __arch_swab64(val);
#elif defined(__arch_swab64p)
return __arch_swab64p(&val);
#elif defined(__SWAB_64_THRU_32__)
__u32 h = val >> 32;
__u32 l = val & ((1ULL << 32) - 1);
return (((__u64)___swab32(l)) << 32) | ((__u64)(___swab32(h)));
#else
return __const_swab64(val);
#endif
}
Other than the endianness, any other concerns?
Harvey
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 14/20] parisc: use the new byteorder headers
2008-08-01 21:23 ` Harvey Harrison
@ 2008-08-01 23:18 ` Grant Grundler
2008-08-02 5:52 ` Harvey Harrison
2008-08-02 18:03 ` Harvey Harrison
0 siblings, 2 replies; 6+ messages in thread
From: Grant Grundler @ 2008-08-01 23:18 UTC (permalink / raw)
To: Harvey Harrison; +Cc: Grant Grundler, Andrew Morton, Kyle McMartin, LKML
On Fri, Aug 01, 2008 at 02:23:37PM -0700, Harvey Harrison wrote:
...
> > Should this only be defined if BITS_PER_LONG is <=32 ?
>
> The new byteorder headers only uses this if no __arch_swab64 is defined.
>
> Further down in the parisc version, an __arch_swab64 is defined in the
> BITS_PER_LONG >=32 case, making this moot.
Ok.
...
> Other than the endianness, any other concerns?
Have you had a chance to test this?
Or can you point me at another big endian arch that has similar
use of header files that has been successfully tested?
I can arrange for access to parisc HW if you have time/interest
in testing this yourself.
thanks,
grant
>
> Harvey
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 14/20] parisc: use the new byteorder headers
2008-08-01 23:18 ` Grant Grundler
@ 2008-08-02 5:52 ` Harvey Harrison
2008-08-02 18:03 ` Harvey Harrison
1 sibling, 0 replies; 6+ messages in thread
From: Harvey Harrison @ 2008-08-02 5:52 UTC (permalink / raw)
To: Grant Grundler
Cc: Andrew Morton, Kyle McMartin, LKML, ralf@linux-mips.org,
Haavard Skinnemoen
On Fri, 2008-08-01 at 17:18 -0600, Grant Grundler wrote:
> On Fri, Aug 01, 2008 at 02:23:37PM -0700, Harvey Harrison wrote:
> ...
> > > Should this only be defined if BITS_PER_LONG is <=32 ?
> >
> > The new byteorder headers only uses this if no __arch_swab64 is defined.
> >
> > Further down in the parisc version, an __arch_swab64 is defined in the
> > BITS_PER_LONG >=32 case, making this moot.
>
> Ok.
>
> ...
> > Other than the endianness, any other concerns?
>
> Have you had a chance to test this?
le-only personally (X86-32).
> Or can you point me at another big endian arch that has similar
> use of header files that has been successfully tested?
AVR32 got a maintainer ack, I'm assuming that was tested. It's not
functionally any different than the existing code really, other
than allowing compile-time folding in the cpu_to_{endian} helpers.
Mips was also acked, but that can be little or big endian.
>
> I can arrange for access to parisc HW if you have time/interest
> in testing this yourself.
Sure, drop me a note.
Harvey
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 14/20] parisc: use the new byteorder headers
2008-08-01 23:18 ` Grant Grundler
2008-08-02 5:52 ` Harvey Harrison
@ 2008-08-02 18:03 ` Harvey Harrison
1 sibling, 0 replies; 6+ messages in thread
From: Harvey Harrison @ 2008-08-02 18:03 UTC (permalink / raw)
To: Grant Grundler; +Cc: Andrew Morton, Kyle McMartin, LKML
My reply yesterday didn't seem to make it out.
On Fri, Aug 1, 2008 at 4:18 PM, Grant Grundler
<grundler@parisc-linux.org> wrote:
> On Fri, Aug 01, 2008 at 02:23:37PM -0700, Harvey Harrison wrote:
>> Other than the endianness, any other concerns?
>
> Have you had a chance to test this?
le-only personally (X86-32).
> Or can you point me at another big endian arch that has similar
> use of header files that has been successfully tested?
>
AVR32 got a maintainer ack, I'm assuming that was tested. It's not
functionally any different than the existing code really, other
than allowing compile-time folding in the cpu_to_{endian} helpers.
Mips was also acked, but that can be little or big endian.
> I can arrange for access to parisc HW if you have time/interest
> in testing this yourself.
>
Sure, drop me a note.
I'll have intermittant connection for the next week, so there might be
a few days before I can reply.
Harvey
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-08-04 6:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-18 0:09 [PATCH 14/20] parisc: use the new byteorder headers Harvey Harrison
2008-08-01 16:06 ` Grant Grundler
2008-08-01 21:23 ` Harvey Harrison
2008-08-01 23:18 ` Grant Grundler
2008-08-02 5:52 ` Harvey Harrison
2008-08-02 18:03 ` Harvey Harrison
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox