49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
133 lines
3 KiB
C
133 lines
3 KiB
C
#ifndef _M68K_CHECKSUM_H
|
|
#define _M68K_CHECKSUM_H
|
|
|
|
#include <linux/in6.h>
|
|
|
|
/*
|
|
* 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
|
|
*/
|
|
__wsum csum_partial(const void *buff, int len, __wsum sum);
|
|
|
|
/*
|
|
* the same as csum_partial, but copies from src while it
|
|
* checksums
|
|
*
|
|
* here even more important to align src and dst on a 32-bit (or even
|
|
* better 64-bit) boundary
|
|
*/
|
|
|
|
__wsum csum_partial_copy_nocheck(const void *src, void *dst,
|
|
int len, __wsum sum);
|
|
|
|
|
|
/*
|
|
* the same as csum_partial_copy, but copies from user space.
|
|
*
|
|
* here even more important to align src and dst on a 32-bit (or even
|
|
* better 64-bit) boundary
|
|
*/
|
|
|
|
extern __wsum csum_partial_copy_from_user(const void __user *src,
|
|
void *dst, int len, __wsum sum, int *csum_err);
|
|
|
|
__sum16 ip_fast_csum(const void *iph, unsigned int ihl);
|
|
|
|
/*
|
|
* Fold a partial checksum
|
|
*/
|
|
|
|
static inline __sum16 csum_fold(__wsum sum)
|
|
{
|
|
unsigned int tmp = (__force u32)sum;
|
|
#ifdef CONFIG_COLDFIRE
|
|
tmp = (tmp & 0xffff) + (tmp >> 16);
|
|
tmp = (tmp & 0xffff) + (tmp >> 16);
|
|
return (__force __sum16)~tmp;
|
|
#else
|
|
__asm__("swap %1\n\t"
|
|
"addw %1, %0\n\t"
|
|
"clrw %1\n\t"
|
|
"addxw %1, %0"
|
|
: "=&d" (sum), "=&d" (tmp)
|
|
: "0" (sum), "1" (sum));
|
|
return (__force __sum16)~sum;
|
|
#endif
|
|
}
|
|
|
|
|
|
/*
|
|
* computes the checksum of the TCP/UDP pseudo-header
|
|
* returns a 16-bit checksum, already complemented
|
|
*/
|
|
|
|
static inline __wsum
|
|
csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
|
|
unsigned short proto, __wsum sum)
|
|
{
|
|
__asm__ ("addl %1,%0\n\t"
|
|
"addxl %4,%0\n\t"
|
|
"addxl %5,%0\n\t"
|
|
"clrl %1\n\t"
|
|
"addxl %1,%0"
|
|
: "=&d" (sum), "=&d" (saddr)
|
|
: "0" (daddr), "1" (saddr), "d" (len + proto),
|
|
"d"(sum));
|
|
return sum;
|
|
}
|
|
|
|
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
|
|
*/
|
|
|
|
extern __sum16 ip_compute_csum(const void *buff, int len);
|
|
|
|
#define _HAVE_ARCH_IPV6_CSUM
|
|
static __inline__ __sum16
|
|
csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
|
|
__u32 len, unsigned short proto, __wsum sum)
|
|
{
|
|
register unsigned long tmp;
|
|
__asm__("addl %2@,%0\n\t"
|
|
"movel %2@(4),%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"movel %2@(8),%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"movel %2@(12),%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"movel %3@,%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"movel %3@(4),%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"movel %3@(8),%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"movel %3@(12),%1\n\t"
|
|
"addxl %1,%0\n\t"
|
|
"addxl %4,%0\n\t"
|
|
"clrl %1\n\t"
|
|
"addxl %1,%0"
|
|
: "=&d" (sum), "=&d" (tmp)
|
|
: "a" (saddr), "a" (daddr), "d" (len + proto),
|
|
"0" (sum));
|
|
|
|
return csum_fold(sum);
|
|
}
|
|
|
|
#endif /* _M68K_CHECKSUM_H */
|