[PATCH][RESEND] powerpc: merge include/asmppc*/checksum.h into include/asmpowerpc/checksum.h
Kumar Gala
galak at freescale.com
Fri Oct 21 02:44:46 EST 2005
Signedoffby: Kumar Gala <kumar.gala at freescale.com>

commit 5bb6a54bbcd717339f737eba160b6824ec99cd27
tree b23e814e1546aeceaa58ccfafc714a8cf0a13656
parent 1288b50c0dd4747595c5e73dbff02088d8eeefcc
author Kumar K. Gala <kumar.gala at freescale.com> Wed, 21 Sep 2005 14:10:11 0500
committer Kumar K. Gala <kumar.gala at freescale.com> Wed, 21 Sep 2005 14:10:11 0500
include/asmpowerpc/checksum.h  132 ++++++++++++++++++++++++++++++++++++++++
include/asmppc/checksum.h  107 
include/asmppc64/checksum.h  107 
3 files changed, 132 insertions(+), 214 deletions()
diff git a/include/asmpowerpc/checksum.h b/include/asmpowerpc/checksum.h
new file mode 100644
 /dev/null
+++ b/include/asmpowerpc/checksum.h
@@ 0,0 +1,132 @@
+#ifndef _ASM_POWERPC_CHECKSUM_H
+#define _ASM_POWERPC_CHECKSUM_H
+
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/*
+ * This is a version of ip_compute_csum() optimized for IP headers,
+ * which always checksum on 4 octet boundaries. ihl is the number
+ * of 32bit words and is always >= 5.
+ */
+extern unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl);
+
+/*
+ * computes the checksum of the TCP/UDP pseudoheader
+ * returns a 16bit checksum, already complemented
+ */
+extern unsigned short csum_tcpudp_magic(unsigned long saddr,
+ unsigned long daddr,
+ unsigned short len,
+ unsigned short proto,
+ unsigned int sum);
+
+/*
+ * computes the checksum of a memory block at buff, length len,
+ * and adds in "sum" (32bit)
+ *
+ * returns a 32bit number suitable for feeding into itself
+ * or csum_tcpudp_magic
+ *
+ * this function must be called with even lengths, except
+ * for the last fragment, which may be odd
+ *
+ * it's best to have buff aligned on a 32bit boundary
+ */
+extern unsigned int csum_partial(const unsigned char * buff, int len,
+ unsigned int sum);
+
+/*
+ * Computes the checksum of a memory block at src, length len,
+ * and adds in "sum" (32bit), while copying the block to dst.
+ * If an access exception occurs on src or dst, it stores EFAULT
+ * to *src_err or *dst_err respectively (if that pointer is not
+ * NULL), and, for an error on src, zeroes the rest of dst.
+ *
+ * Like csum_partial, this must be called with even lengths,
+ * except for the last fragment.
+ */
+extern unsigned int csum_partial_copy_generic(const char *src, char *dst,
+ int len, unsigned int sum,
+ int *src_err, int *dst_err);
+/*
+ * the same as csum_partial, but copies from src to dst while it
+ * checksums.
+ */
+unsigned int csum_partial_copy_nocheck(const char *src,
+ char *dst,
+ int len,
+ unsigned int sum);
+
+#define csum_partial_copy_from_user(src, dst, len, sum, errp) \
+ csum_partial_copy_generic((src), (dst), (len), (sum), (errp), NULL)
+
+#define csum_partial_copy_nocheck(src, dst, len, sum) \
+ csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL)
+
+
+/*
+ * turns a 32bit partial checksum (e.g. from csum_partial) into a
+ * 1's complement 16bit checksum.
+ */
+static inline unsigned int csum_fold(unsigned int sum)
+{
+ unsigned int tmp;
+
+ /* swap the two 16bit halves of sum */
+ __asm__("rlwinm %0,%1,16,0,31" : "=r" (tmp) : "r" (sum));
+ /* if there is a carry from adding the two 16bit halves,
+ it will carry from the lower half into the upper half,
+ giving us the correct sum in the upper half. */
+ sum = ~(sum + tmp) >> 16;
+ return sum;
+}
+
+/*
+ * this routine is used for miscellaneous IPlike checksums, mainly
+ * in icmp.c
+ */
+static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
+{
+ return csum_fold(csum_partial(buff, len, 0));
+}
+
+#ifdef __powerpc64__
+static inline u32 csum_tcpudp_nofold(u32 saddr,
+ u32 daddr,
+ unsigned short len,
+ unsigned short proto,
+ unsigned int sum)
+{
+ unsigned long s = sum;
+
+ s += saddr;
+ s += daddr;
+ s += (proto << 16) + len;
+ s += (s >> 32);
+ return (u32) s;
+}
+#else
+static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
+ unsigned long daddr,
+ unsigned short len,
+ unsigned short proto,
+ unsigned int sum)
+{
+ __asm__("\n\
+ addc %0,%0,%1 \n\
+ adde %0,%0,%2 \n\
+ adde %0,%0,%3 \n\
+ addze %0,%0 \n\
+ "
+ : "=r" (sum)
+ : "r" (daddr), "r"(saddr), "r"((proto<<16)+len), "0"(sum));
+ return sum;
+}
+
+#endif
+#endif
diff git a/include/asmppc/checksum.h b/include/asmppc/checksum.h
deleted file mode 100644
 a/include/asmppc/checksum.h
+++ /dev/null
@@ 1,107 +0,0 @@
#ifdef __KERNEL__
#ifndef _PPC_CHECKSUM_H
#define _PPC_CHECKSUM_H


/*
 * computes the checksum of a memory block at buff, length len,
 * and adds in "sum" (32bit)
 *
 * returns a 32bit number suitable for feeding into itself
 * or csum_tcpudp_magic
 *
 * this function must be called with even lengths, except
 * for the last fragment, which may be odd
 *
 * it's best to have buff aligned on a 32bit boundary
 */
extern unsigned int csum_partial(const unsigned char * buff, int len,
 unsigned int sum);

/*
 * Computes the checksum of a memory block at src, length len,
 * and adds in "sum" (32bit), while copying the block to dst.
 * If an access exception occurs on src or dst, it stores EFAULT
 * to *src_err or *dst_err respectively (if that pointer is not
 * NULL), and, for an error on src, zeroes the rest of dst.
 *
 * Like csum_partial, this must be called with even lengths,
 * except for the last fragment.
 */
extern unsigned int csum_partial_copy_generic(const char *src, char *dst,
 int len, unsigned int sum,
 int *src_err, int *dst_err);

#define csum_partial_copy_from_user(src, dst, len, sum, errp) \
 csum_partial_copy_generic((__force void *)(src), (dst), (len), (sum), (errp), NULL)

/* FIXME: this needs to be written to really do no check  Cort */
#define csum_partial_copy_nocheck(src, dst, len, sum) \
 csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL)

/*
 * turns a 32bit partial checksum (e.g. from csum_partial) into a
 * 1's complement 16bit checksum.
 */
static inline unsigned int csum_fold(unsigned int sum)
{
 unsigned int tmp;

 /* swap the two 16bit halves of sum */
 __asm__("rlwinm %0,%1,16,0,31" : "=r" (tmp) : "r" (sum));
 /* if there is a carry from adding the two 16bit halves,
 it will carry from the lower half into the upper half,
 giving us the correct sum in the upper half. */
 sum = ~(sum + tmp) >> 16;
 return sum;
}

/*
 * this routine is used for miscellaneous IPlike checksums, mainly
 * in icmp.c
 */
static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
{
 return csum_fold(csum_partial(buff, len, 0));
}

/*
 * FIXME: I swiped this one from the sparc and made minor modifications.
 * It may not be correct.  Cort
 */
static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
 unsigned long daddr,
 unsigned short len,
 unsigned short proto,
 unsigned int sum)
{
 __asm__("\n\
 addc %0,%0,%1 \n\
 adde %0,%0,%2 \n\
 adde %0,%0,%3 \n\
 addze %0,%0 \n\
 "
 : "=r" (sum)
 : "r" (daddr), "r"(saddr), "r"((proto<<16)+len), "0"(sum));
 return sum;
}

/*
 * This is a version of ip_compute_csum() optimized for IP headers,
 * which always checksum on 4 octet boundaries. ihl is the number
 * of 32bit words and is always >= 5.
 */
extern unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl);

/*
 * computes the checksum of the TCP/UDP pseudoheader
 * returns a 16bit checksum, already complemented
 */
extern unsigned short csum_tcpudp_magic(unsigned long saddr,
 unsigned long daddr,
 unsigned short len,
 unsigned short proto,
 unsigned int sum);

#endif
#endif /* __KERNEL__ */
diff git a/include/asmppc64/checksum.h b/include/asmppc64/checksum.h
deleted file mode 100644
 a/include/asmppc64/checksum.h
+++ /dev/null
@@ 1,107 +0,0 @@
#ifndef _PPC64_CHECKSUM_H
#define _PPC64_CHECKSUM_H

/*
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */

/*
 * This is a version of ip_compute_csum() optimized for IP headers,
 * which always checksum on 4 octet boundaries. ihl is the number
 * of 32bit words and is always >= 5.
 */
extern unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl);

/*
 * computes the checksum of the TCP/UDP pseudoheader
 * returns a 16bit checksum, already complemented
 */
extern unsigned short csum_tcpudp_magic(unsigned long saddr,
 unsigned long daddr,
 unsigned short len,
 unsigned short proto,
 unsigned int sum);

/*
 * computes the checksum of a memory block at buff, length len,
 * and adds in "sum" (32bit)
 *
 * returns a 32bit number suitable for feeding into itself
 * or csum_tcpudp_magic
 *
 * this function must be called with even lengths, except
 * for the last fragment, which may be odd
 *
 * it's best to have buff aligned on a 32bit boundary
 */
extern unsigned int csum_partial(const unsigned char * buff, int len,
 unsigned int sum);

/*
 * the same as csum_partial, but copies from src to dst while it
 * checksums
 */
extern unsigned int csum_partial_copy_generic(const char *src, char *dst,
 int len, unsigned int sum,
 int *src_err, int *dst_err);
/*
 * the same as csum_partial, but copies from src to dst while it
 * checksums.
 */

unsigned int csum_partial_copy_nocheck(const char *src,
 char *dst,
 int len,
 unsigned int sum);

/*
 * turns a 32bit partial checksum (e.g. from csum_partial) into a
 * 1's complement 16bit checksum.
 */
static inline unsigned int csum_fold(unsigned int sum)
{
 unsigned int tmp;

 /* swap the two 16bit halves of sum */
 __asm__("rlwinm %0,%1,16,0,31" : "=r" (tmp) : "r" (sum));
 /* if there is a carry from adding the two 16bit halves,
 it will carry from the lower half into the upper half,
 giving us the correct sum in the upper half. */
 sum = ~(sum + tmp) >> 16;
 return sum;
}

/*
 * this routine is used for miscellaneous IPlike checksums, mainly
 * in icmp.c
 */
static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
{
 return csum_fold(csum_partial(buff, len, 0));
}

#define csum_partial_copy_from_user(src, dst, len, sum, errp) \
 csum_partial_copy_generic((src), (dst), (len), (sum), (errp), NULL)

#define csum_partial_copy_nocheck(src, dst, len, sum) \
 csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL)

static inline u32 csum_tcpudp_nofold(u32 saddr,
 u32 daddr,
 unsigned short len,
 unsigned short proto,
 unsigned int sum)
{
 unsigned long s = sum;

 s += saddr;
 s += daddr;
 s += (proto << 16) + len;
 s += (s >> 32);
 return (u32) s;
}

#endif
More information about the Linuxppc64dev
mailing list