Eric Lee / smarc-uboot | Embedian Git Server

Commit 2b445e4d31940d512b3257f7398b794be710b8a9

Authored by Alexander Graf 2016-08-19 07:23:22 +0800

Committed by Bin Meng 2016-10-18 15:58:50 +0800

Exists in v2017.01-smarct4x and in 25 other branches

x86: Move table csum into separate header

We need the checksum function without all the other table functionality
soon, so let's split it out into its own header file.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 24 additions and 12 deletions Inline Diff

arch/x86/include/asm/tables.h
arch/x86/lib/tables.c
include/tables_csum.h

arch/x86/include/asm/tables.h

Diff comments View file @ 2b445e4

 /*
  * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef _X86_TABLES_H_
 #define _X86_TABLES_H_
+#include <tables_csum.h>
 /*
  * All x86 tables happen to like the address range from 0xf0000 to 0x100000.
  * We use 0xf0000 as the starting address to store those tables, including
  * PIRQ routing table, Multi-Processor table and ACPI table.
  */
 #define ROM_TABLE_ADDR	0xf0000
 #define ROM_TABLE_ALIGN	1024
 /* SeaBIOS expects coreboot tables at address range 0x0000-0x1000 */
 #define CB_TABLE_ADDR	0x800
 /**
  * table_compute_checksum() - Compute a table checksum
  *
  * This computes an 8-bit checksum for the configuration table.
  * All bytes in the configuration table, including checksum itself and
  * reserved bytes must add up to zero.
  *
  * @v:		configuration table base address
  * @len:	configuration table size
  * @return:	the 8-bit checksum
  */
 u8 table_compute_checksum(void *v, int len);
 /**
  * table_fill_string() - Fill a string with pad in the configuration table
  *
  * This fills a string in the configuration table. It copies number of bytes
  * from the source string, and if source string length is shorter than the
  * required size to copy, pad the table string with the given pad character.
  *
  * @dest:	where to fill a string
  * @src:	where to copy from
  * @n:		number of bytes to copy
  * @pad:	character to pad the remaining bytes
  */
 void table_fill_string(char *dest, const char *src, size_t n, char pad);
 /**
  * write_tables() - Write x86 configuration tables
  *
  * This writes x86 configuration tables, including PIRQ routing table,
  * Multi-Processor table and ACPI table. Whether a specific type of
  * configuration table is written is controlled by a Kconfig option.
  */
 void write_tables(void);
 /**
  * write_pirq_routing_table() - Write PIRQ routing table
  *
  * This writes PIRQ routing table at a given address.
  *
  * @start:	start address to write PIRQ routing table
  * @return:	end address of PIRQ routing table
  */
 u32 write_pirq_routing_table(u32 start);
 #endif /* _X86_TABLES_H_ */

arch/x86/lib/tables.c

Diff comments View file @ 2b445e4

 /*
  * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <asm/sfi.h>
 #include <asm/mpspec.h>
 #include <asm/smbios.h>
 #include <asm/tables.h>
 #include <asm/acpi_table.h>
 #include <asm/coreboot_tables.h>
 /**
  * Function prototype to write a specific configuration table
  *
  * @addr:	start address to write the table
  * @return:	end address of the table
  */
 typedef u32 (*table_write)(u32 addr);
 static table_write table_write_funcs[] = {
 #ifdef CONFIG_GENERATE_PIRQ_TABLE
 	write_pirq_routing_table,
 #endif
 #ifdef CONFIG_GENERATE_SFI_TABLE
 	write_sfi_table,
 #endif
 #ifdef CONFIG_GENERATE_MP_TABLE
 	write_mp_table,
 #endif
 #ifdef CONFIG_GENERATE_ACPI_TABLE
 	write_acpi_tables,
 #endif
 #ifdef CONFIG_GENERATE_SMBIOS_TABLE
 	write_smbios_table,
 #endif
 };
-u8 table_compute_checksum(void *v, int len)
-{
-	u8 *bytes = v;
-	u8 checksum = 0;
-	int i;
-	for (i = 0; i < len; i++)
-		checksum -= bytes[i];
-	return checksum;
-}
 void table_fill_string(char *dest, const char *src, size_t n, char pad)
 {
 	int start, len;
 	int i;
 	strncpy(dest, src, n);
 	/* Fill the remaining bytes with pad */
 	len = strlen(src);
 	start = len < n ? len : n;
 	for (i = start; i < n; i++)
 		dest[i] = pad;
 }
 void write_tables(void)
 {
 	u32 rom_table_start = ROM_TABLE_ADDR;
 	u32 rom_table_end;
 #ifdef CONFIG_SEABIOS
 	u32 high_table, table_size;
 	struct memory_area cfg_tables[ARRAY_SIZE(table_write_funcs) + 1];
 #endif
 	int i;
 	for (i = 0; i < ARRAY_SIZE(table_write_funcs); i++) {
 		rom_table_end = table_write_funcs[i](rom_table_start);
 		rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN);
 #ifdef CONFIG_SEABIOS
 		table_size = rom_table_end - rom_table_start;
 		high_table = (u32)high_table_malloc(table_size);
 		if (high_table) {
 			table_write_funcs[i](high_table);
 			cfg_tables[i].start = high_table;
 			cfg_tables[i].size = table_size;
 		} else {
 			printf("%d: no memory for configuration tables\n", i);
 		}
 #endif
 		rom_table_start = rom_table_end;
 	}
 #ifdef CONFIG_SEABIOS
 	/* make sure the last item is zero */
 	cfg_tables[i].size = 0;
 	write_coreboot_table(CB_TABLE_ADDR, cfg_tables);
 #endif
 }

include/tables_csum.h

Diff comments View file @ 2b445e4

File was created	1	/*
	2	* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
	3	*
	4	* SPDX-License-Identifier: GPL-2.0+
	5	*/
	6
	7	#ifndef _TABLES_CSUM_H_
	8	#define _TABLES_CSUM_H_
	9
	10	static inline u8 table_compute_checksum(void *v, int len)
	11	{
	12	u8 *bytes = v;
	13	u8 checksum = 0;
	14	int i;
	15
	16	for (i = 0; i < len; i++)
	17	checksum -= bytes[i];
	18
	19	return checksum;
	20	}
	21
	22	#endif
	23