Skip to content

L
linux-davinci
Commit 3767f3f1 authored by Paul Mundt's avatar Paul Mundt
Browse files
Options

sh: Convert sh64 to use the generic checksum code. 

This plugs in GENERIC_CSUM support on sh64, and kills off all of the old
references.
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2b74b856
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 301 deletions
arch/sh/Kconfig
View file @ 3767f3f1
......@@ -50,6 +50,10 @@ config GENERIC_BUG
def_bool y
depends on BUG && SUPERH32
config GENERIC_CSUM
def_bool y
depends on SUPERH64
config GENERIC_FIND_NEXT_BIT
def_bool y
......
arch/sh/include/asm/checksum.h
View file @ 3767f3f1
#ifdef CONFIG_SUPERH32
# include "checksum_32.h"
#else
# include "checksum_64.h"
# include <asm-generic/checksum.h>
#endif
arch/sh/include/asm/checksum_64.h deleted 100644 → 0
View file @ 2b74b856
#ifndef __ASM_SH_CHECKSUM_64_H
#define __ASM_SH_CHECKSUM_64_H
/*
* include/asm-sh/checksum_64.h
*
* Copyright (C) 2000, 2001 Paolo Alberelli
*
* 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.
*/
/*
* computes the checksum of a memory block at buff, length len,
* and adds in "sum" (32-bit)
*
* returns a 32-bit 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 32-bit boundary
*/
asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);
/*
* 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
* access_ok().
*/
__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len,
__wsum sum);
__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
int len, __wsum sum, int *err_ptr);
static inline __sum16 csum_fold(__wsum csum)
{
u32 sum = (__force u32)csum;
sum = (sum & 0xffff) + (sum >> 16);
sum = (sum & 0xffff) + (sum >> 16);
return (__force __sum16)~sum;
}
__sum16 ip_fast_csum(const void *iph, unsigned int ihl);
__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
unsigned short len, unsigned short proto,
__wsum sum);
/*
* computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented
*/
static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto,
__wsum sum)
{
return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
}
/*
* this routine is used for miscellaneous IP-like checksums, mainly
* in icmp.c
*/
static inline __sum16 ip_compute_csum(const void *buff, int len)
{
return csum_fold(csum_partial(buff, len, 0));
}
#endif /* __ASM_SH_CHECKSUM_64_H */
arch/sh/kernel/sh_ksyms_64.c
View file @ 3767f3f1
......@@ -38,13 +38,6 @@ EXPORT_SYMBOL(clear_user_page);
EXPORT_SYMBOL(flush_dcache_page);
#endif
/* Networking helper routines. */
EXPORT_SYMBOL(csum_partial);
EXPORT_SYMBOL(csum_partial_copy_nocheck);
#ifdef CONFIG_IPV6
EXPORT_SYMBOL(csum_ipv6_magic);
#endif
#ifdef CONFIG_VT
EXPORT_SYMBOL(screen_info);
#endif
......
arch/sh/lib64/Makefile
View file @ 3767f3f1
......@@ -10,7 +10,7 @@
#
# Panic should really be compiled as PIC
lib-y := udelay.o c-checksum.o dbg.o panic.o memcpy.o memset.o \
lib-y := udelay.o dbg.o panic.o memcpy.o memset.o \
copy_user_memcpy.o copy_page.o clear_page.o strcpy.o strlen.o
# Extracted from libgcc
......
arch/sh/lib64/c-checksum.c deleted 100644 → 0
View file @ 2b74b856
/*
* arch/sh/lib64/c-checksum.c
*
* This file contains network checksum routines that are better done
* in an architecture-specific manner due to speed..
*/
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
static inline unsigned short from64to16(unsigned long long x)
{
/* add up 32-bit words for 33 bits */
x = (x & 0xffffffff) + (x >> 32);
/* add up 16-bit and 17-bit words for 17+c bits */
x = (x & 0xffff) + (x >> 16);
/* add up 16-bit and 2-bit for 16+c bit */
x = (x & 0xffff) + (x >> 16);
/* add up carry.. */
x = (x & 0xffff) + (x >> 16);
return x;
}
static inline unsigned short foldto16(unsigned long x)
{
/* add up 16-bit for 17 bits */
x = (x & 0xffff) + (x >> 16);
/* add up carry.. */
x = (x & 0xffff) + (x >> 16);
return x;
}
static inline unsigned short myfoldto16(unsigned long long x)
{
/* Fold down to 32-bits so we don't lose in the typedef-less
network stack. */
/* 64 to 33 */
x = (x & 0xffffffff) + (x >> 32);
/* 33 to 32 */
x = (x & 0xffffffff) + (x >> 32);
/* add up 16-bit for 17 bits */
x = (x & 0xffff) + (x >> 16);
/* add up carry.. */
x = (x & 0xffff) + (x >> 16);
return x;
}
#define odd(x) ((x)&1)
#define U16(x) ntohs(x)
static unsigned long do_csum(const unsigned char *buff, int len)
{
int odd, count;
unsigned long result = 0;
pr_debug("do_csum buff %p, len %d (0x%x)\n", buff, len, len);
#ifdef DEBUG
for (i = 0; i < len; i++) {
if ((i % 26) == 0)
printk("\n");
printk("%02X ", buff[i]);
}
#endif
if (len <= 0)
goto out;
odd = 1 & (unsigned long) buff;
if (odd) {
result = *buff << 8;
len--;
buff++;
}
count = len >> 1; /* nr of 16-bit words.. */
if (count) {
if (2 & (unsigned long) buff) {
result += *(unsigned short *) buff;
count--;
len -= 2;
buff += 2;
}
count >>= 1; /* nr of 32-bit words.. */
if (count) {
unsigned long carry = 0;
do {
unsigned long w = *(unsigned long *) buff;
buff += 4;
count--;
result += carry;
result += w;
carry = (w > result);
} while (count);
result += carry;
result = (result & 0xffff) + (result >> 16);
}
if (len & 2) {
result += *(unsigned short *) buff;
buff += 2;
}
}
if (len & 1)
result += *buff;
result = foldto16(result);
if (odd)
result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
pr_debug("\nCHECKSUM is 0x%lx\n", result);
out:
return result;
}
/* computes the checksum of a memory block at buff, length len,
and adds in "sum" (32-bit) */
__wsum csum_partial(const void *buff, int len, __wsum sum)
{
unsigned long long result = do_csum(buff, len);
/* add in old sum, and carry.. */
result += (__force u32)sum;
/* 32+c bits -> 32 bits */
result = (result & 0xffffffff) + (result >> 32);
pr_debug("csum_partial, buff %p len %d sum 0x%x result=0x%016Lx\n",
buff, len, sum, result);
return (__force __wsum)result;
}
/* Copy while checksumming, otherwise like csum_partial. */
__wsum
csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
{
sum = csum_partial(src, len, sum);
memcpy(dst, src, len);
return sum;
}
/* Copy from userspace and compute checksum. If we catch an exception
then zero the rest of the buffer. */
__wsum
csum_partial_copy_from_user(const void __user *src, void *dst, int len,
__wsum sum, int *err_ptr)
{
int missing;
pr_debug
("csum_partial_copy_from_user src %p, dest %p, len %d, sum %08x, err_ptr %p\n",
src, dst, len, sum, err_ptr);
missing = copy_from_user(dst, src, len);
pr_debug(" access_ok %d\n", __access_ok((unsigned long) src, len));
pr_debug(" missing %d\n", missing);
if (missing) {
memset(dst + len - missing, 0, missing);
*err_ptr = -EFAULT;
}
return csum_partial(dst, len, sum);
}
/* Copy to userspace and compute checksum. */
__wsum
csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len,
__wsum sum, int *err_ptr)
{
sum = csum_partial(src, len, sum);
if (copy_to_user(dst, src, len))
*err_ptr = -EFAULT;
return sum;
}
/*
* This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries.
*/
__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
{
pr_debug("ip_fast_csum %p,%d\n", iph, ihl);
return (__force __sum16)~do_csum(iph, ihl * 4);
}
__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto, __wsum sum)
{
unsigned long long result;
pr_debug("ntohs(0x%x)=0x%x\n", 0xdead, ntohs(0xdead));
pr_debug("htons(0x%x)=0x%x\n", 0xdead, htons(0xdead));
result = (__force u64) saddr + (__force u64) daddr +
(__force u64) sum + ((len + proto) << 8);
/* Fold down to 32-bits so we don't lose in the typedef-less
network stack. */
/* 64 to 33 */
result = (result & 0xffffffff) + (result >> 32);
/* 33 to 32 */
result = (result & 0xffffffff) + (result >> 32);
pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
__func__, saddr, daddr, len, proto, sum, result);
return (__wsum)result;
}
EXPORT_SYMBOL(csum_tcpudp_nofold);
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