Commit 4df70cca authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds

[PATCH] m32r: update checksum functions

  This patch update checksum routines.
  And EXPORT_SYMBOL() is moved from m32r_ksyms.c to csum_partial_copy.c.
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a1a386ef
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/checksum.h> #include <asm/checksum.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/hardirq.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
...@@ -42,7 +41,6 @@ EXPORT_SYMBOL(__up); ...@@ -42,7 +41,6 @@ EXPORT_SYMBOL(__up);
EXPORT_SYMBOL(__down_trylock); EXPORT_SYMBOL(__down_trylock);
/* Networking helper routines. */ /* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy);
/* Delay loops */ /* Delay loops */
EXPORT_SYMBOL(__udelay); EXPORT_SYMBOL(__udelay);
EXPORT_SYMBOL(__delay); EXPORT_SYMBOL(__delay);
......
...@@ -14,38 +14,34 @@ ...@@ -14,38 +14,34 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
* $Id$
*/ */
#include <net/checksum.h>
#include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <net/checksum.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/string.h> #include <asm/string.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* /*
* copy while checksumming, otherwise like csum_partial * Copy while checksumming, otherwise like csum_partial
*/ */
unsigned int csum_partial_copy(const char *src, char *dst, unsigned int csum_partial_copy_nocheck (const char *src, char *dst,
int len, int sum) int len, unsigned int sum)
{ {
/*
* It's 2:30 am and I don't feel like doing it real ...
* This is lots slower than the real thing (tm)
*/
sum = csum_partial(src, len, sum); sum = csum_partial(src, len, sum);
memcpy(dst, src, len); memcpy(dst, src, len);
return sum; return sum;
} }
EXPORT_SYMBOL(csum_partial_copy_nocheck);
/* /*
* Copy from userspace and compute checksum. If we catch an exception * Copy from userspace and compute checksum. If we catch an exception
* then zero the rest of the buffer. * then zero the rest of the buffer.
unsigned int csum_partial_copy_from_user (const char *src, char *dst,
int len, unsigned int sum,
int *err_ptr)
*/ */
unsigned int csum_partial_copy_generic_from (const char *src, char *dst, unsigned int csum_partial_copy_from_user (const char __user *src, char *dst,
int len, unsigned int sum, int len, unsigned int sum,
int *err_ptr) int *err_ptr)
{ {
...@@ -59,19 +55,4 @@ unsigned int csum_partial_copy_generic_from (const char *src, char *dst, ...@@ -59,19 +55,4 @@ unsigned int csum_partial_copy_generic_from (const char *src, char *dst,
return csum_partial(dst, len-missing, sum); return csum_partial(dst, len-missing, sum);
} }
unsigned int csum_partial_copy_generic_to (const char *src, char *dst, EXPORT_SYMBOL(csum_partial_copy_from_user);
int len, unsigned int sum,
int *err_ptr)
{
int missing;
missing = copy_to_user(dst, src, len);
if (missing) {
/*
memset(dst + len - missing, 0, missing);
*/
*err_ptr = -EFAULT;
}
return csum_partial(src, len-missing, sum);
}
#ifdef __KERNEL__
#ifndef _ASM_M32R_CHECKSUM_H #ifndef _ASM_M32R_CHECKSUM_H
#define _ASM_M32R_CHECKSUM_H #define _ASM_M32R_CHECKSUM_H
/* $Id$ */
/* /*
* linux/include/asm-m32r/atomic.h * include/asm-m32r/checksum.h
* orig : i386 2.4.10 *
* IP/TCP/UDP checksum routines
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Some code taken from mips and parisc architecture.
* *
* M32R version:
* Copyright (C) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata * Copyright (C) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata
* Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org>
*/ */
/* /*
...@@ -23,71 +29,31 @@ ...@@ -23,71 +29,31 @@
* *
* it's best to have buff aligned on a 32-bit boundary * it's best to have buff aligned on a 32-bit boundary
*/ */
asmlinkage unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum); asmlinkage unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum);
/* /*
* the same as csum_partial, but copies from src while it * The same as csum_partial, but copies from src while it checksums.
* checksums, and handles user-space pointer exceptions correctly, when needed.
* *
* here even more important to align src and dst on a 32-bit (or even * Here even more important to align src and dst on a 32-bit (or even
* better 64-bit) boundary * better 64-bit) boundary
*/ */
extern unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
asmlinkage unsigned int csum_partial_copy_generic(const char *src, char *dst, int len, unsigned int sum);
int len, int sum, int *src_err_ptr, int *dst_err_ptr);
/*
* Note: when you get a NULL pointer exception here this means someone
* passed in an incorrect kernel address to one of these functions.
*
* If you use these functions directly please don't forget the
* verify_area().
*/
extern unsigned int csum_partial_copy(const char *src, char *dst,
int len, int sum);
extern unsigned int csum_partial_copy_generic_from(const char *src,
char *dst, int len, unsigned int sum, int *err_ptr);
extern unsigned int csum_partial_copy_generic_to (const char *src,
char *dst, int len, unsigned int sum, int *err_ptr);
extern __inline__
unsigned int csum_partial_copy_nocheck ( const char *src, char *dst,
int len, int sum)
{
#if 0
return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
#else
return csum_partial_copy( src, dst, len, sum);
#endif
}
extern __inline__
unsigned int csum_partial_copy_from_user ( const char __user *src, char *dst,
int len, int sum, int *err_ptr)
{
#if 0
return csum_partial_copy_generic ( src, dst, len, sum, err_ptr, NULL);
#else
return csum_partial_copy_generic_from ( src, dst, len, sum, err_ptr);
#endif
}
/* /*
* These are the old (and unsafe) way of doing checksums, a warning message will be * This is a new version of the above that records errors it finds in *errp,
* printed if they are used and an exeption occurs. * but continues and zeros thre rest of the buffer.
*
* these functions should go away after some time.
*/ */
extern unsigned int csum_partial_copy_from_user(const char __user *src,
#define csum_partial_copy_fromuser csum_partial_copy char *dst,
unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum); int len, unsigned int sum,
int *err_ptr);
/* /*
* Fold a partial checksum * Fold a partial checksum
*/ */
static __inline__ unsigned int csum_fold(unsigned int sum) static inline unsigned int csum_fold(unsigned int sum)
{ {
unsigned long tmpreg; unsigned long tmpreg;
__asm__( __asm__(
...@@ -106,13 +72,10 @@ static __inline__ unsigned int csum_fold(unsigned int sum) ...@@ -106,13 +72,10 @@ static __inline__ unsigned int csum_fold(unsigned int sum)
} }
/* /*
* This is a version of ip_compute_csum() optimized for IP headers, * This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries. * which always checksum on 4 octet boundaries.
*
* By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by
* Arnt Gulbrandsen.
*/ */
static __inline__ unsigned short ip_fast_csum(unsigned char * iph, static inline unsigned short ip_fast_csum(unsigned char * iph,
unsigned int ihl) { unsigned int ihl) {
unsigned long sum, tmpreg0, tmpreg1; unsigned long sum, tmpreg0, tmpreg1;
...@@ -148,11 +111,11 @@ static __inline__ unsigned short ip_fast_csum(unsigned char * iph, ...@@ -148,11 +111,11 @@ static __inline__ unsigned short ip_fast_csum(unsigned char * iph,
return csum_fold(sum); return csum_fold(sum);
} }
static __inline__ unsigned long csum_tcpudp_nofold(unsigned long saddr, static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
unsigned long daddr, unsigned long daddr,
unsigned short len, unsigned short len,
unsigned short proto, unsigned short proto,
unsigned int sum) unsigned int sum)
{ {
#if defined(__LITTLE_ENDIAN) #if defined(__LITTLE_ENDIAN)
unsigned long len_proto = (ntohs(len)<<16)+proto*256; unsigned long len_proto = (ntohs(len)<<16)+proto*256;
...@@ -180,7 +143,7 @@ static __inline__ unsigned long csum_tcpudp_nofold(unsigned long saddr, ...@@ -180,7 +143,7 @@ static __inline__ unsigned long csum_tcpudp_nofold(unsigned long saddr,
* computes the checksum of the TCP/UDP pseudo-header * computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented * returns a 16-bit checksum, already complemented
*/ */
static __inline__ unsigned short int csum_tcpudp_magic(unsigned long saddr, static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
unsigned long daddr, unsigned long daddr,
unsigned short len, unsigned short len,
unsigned short proto, unsigned short proto,
...@@ -194,16 +157,16 @@ static __inline__ unsigned short int csum_tcpudp_magic(unsigned long saddr, ...@@ -194,16 +157,16 @@ static __inline__ unsigned short int csum_tcpudp_magic(unsigned long saddr,
* in icmp.c * in icmp.c
*/ */
static __inline__ unsigned short ip_compute_csum(unsigned char * buff, int len) { static inline unsigned short ip_compute_csum(unsigned char * buff, int len) {
return csum_fold (csum_partial(buff, len, 0)); return csum_fold (csum_partial(buff, len, 0));
} }
#define _HAVE_ARCH_IPV6_CSUM #define _HAVE_ARCH_IPV6_CSUM
static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr, static inline unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
struct in6_addr *daddr, struct in6_addr *daddr,
__u16 len, __u16 len,
unsigned short proto, unsigned short proto,
unsigned int sum) unsigned int sum)
{ {
unsigned long tmpreg0, tmpreg1, tmpreg2, tmpreg3; unsigned long tmpreg0, tmpreg1, tmpreg2, tmpreg3;
__asm__( __asm__(
...@@ -237,20 +200,5 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr, ...@@ -237,20 +200,5 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
return csum_fold(sum); return csum_fold(sum);
} }
/*
* Copy and checksum to user
*/
#define HAVE_CSUM_COPY_USER
static __inline__ unsigned int csum_and_copy_to_user (const char *src, char *dst,
int len, int sum, int *err_ptr)
{
if (access_ok(VERIFY_WRITE, dst, len))
return csum_partial_copy_generic_to(src, dst, len, sum, err_ptr);
if (len)
*err_ptr = -EFAULT;
return -1; /* invalid checksum */
}
#endif /* _ASM_M32R_CHECKSUM_H */ #endif /* _ASM_M32R_CHECKSUM_H */
#endif /* __KERNEL__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment