Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Use ipchecksum from net/

Browse Source 
The existing IP checksum function is only accessible to the 'coreboot' cpu.
Drop it in favour of the new code in the network subsystem.

Signed-off-by: Simon Glass <sjg@chromium.org>
master
Simon Glass 10 years ago
parent 9b0e35cb48
commit b18c68d891
4 changed files with 4 additions and 97 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      arch/x86/cpu/coreboot/Makefile
  2. 55
      arch/x86/cpu/coreboot/ipchecksum.c
  3. 8
      arch/x86/cpu/coreboot/tables.c
  4. 37
      arch/x86/include/asm/arch-coreboot/ipchecksum.h

1
arch/x86/cpu/coreboot/Makefile
Unescape View File

@ -16,7 +16,6 @@
obj-y += car.o obj-y += car.o
obj-y += coreboot.o obj-y += coreboot.o
obj-y += tables.o obj-y += tables.o
obj-y += ipchecksum.o
obj-y += sdram.o obj-y += sdram.o
obj-y += timestamp.o obj-y += timestamp.o
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o

55
arch/x86/cpu/coreboot/ipchecksum.c
Unescape View File

@ -1,55 +0,0 @@
/*
* This file is part of the libpayload project.
*
* It has originally been taken from the FreeBSD project.
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* Copyright (c) 2008 coresystems GmbH
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <linux/types.h>
#include <linux/compiler.h>
#include <asm/arch/ipchecksum.h>
unsigned short ipchksum(const void *vptr, unsigned long nbytes)
{
int sum, oddbyte;
const unsigned short *ptr = vptr;
sum = 0;
while (nbytes > 1) {
sum += *ptr++;
nbytes -= 2;
}
if (nbytes == 1) {
oddbyte = 0;
((u8 *)&oddbyte)[0] = *(u8 *) ptr;
((u8 *)&oddbyte)[1] = 0;
sum += oddbyte;
}
sum = (sum >> 16) + (sum & 0xffff);
sum += (sum >> 16);
return ~sum;
}

8
arch/x86/cpu/coreboot/tables.c
Unescape View File

@ -8,7 +8,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/ipchecksum.h> #include <net.h>
#include <asm/arch/sysinfo.h> #include <asm/arch/sysinfo.h>
#include <asm/arch/tables.h> #include <asm/arch/tables.h>
@ -131,11 +131,11 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
return 0; return 0;
/* Make sure the checksums match. */ /* Make sure the checksums match. */
if (ipchksum((u16 *) header, sizeof(*header)) != 0) if (!ip_checksum_ok(header, sizeof(*header)))
return -1; return -1;
if (ipchksum((u16 *) (ptr + sizeof(*header)), if (compute_ip_checksum(ptr + sizeof(*header), header->table_bytes) !=
header->table_bytes) != header->table_checksum) header->table_checksum)
return -1; return -1;
/* Now, walk the tables. */ /* Now, walk the tables. */

37
arch/x86/include/asm/arch-coreboot/ipchecksum.h
Unescape View File

@ -1,37 +0,0 @@
/*
* This file is part of the libpayload project.
*
* It has originally been taken from the FreeBSD project.
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* Copyright (c) 2008 coresystems GmbH
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _COREBOOT_IPCHECKSUM_H
#define _COREBOOT_IPCHECKSUM_H
unsigned short ipchksum(const void *vptr, unsigned long nbytes);
#endif
Write Preview
Loading…
Cancel
Save