diff options
| author | Sven Schnelle <svens@stackframe.org> | 2011-08-14 20:56:34 +0200 |
|---|---|---|
| committer | Sven Schnelle <svens@stackframe.org> | 2011-08-26 20:08:52 +0200 |
| commit | 164bcfdd1b0b2cc789203eeb9e3ff842df215a7c (patch) | |
| tree | 8d8da7411a1c9d238c2a3b51d08f9007953b2854 /src/arch/x86/boot/tables.c | |
| parent | bc081cdf6d371988b0e280b8a20b451c49d43c77 (diff) | |
| download | coreboot-164bcfdd1b0b2cc789203eeb9e3ff842df215a7c.tar.xz | |
Add automatic SMBIOS table generation
Change-Id: I0ae16dda8969638a8f70fe1d2e29e992aef3a834
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Reviewed-on: http://review.coreboot.org/152
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch/x86/boot/tables.c')
| -rw-r--r-- | src/arch/x86/boot/tables.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index d816e76750..29d2ec09b2 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -31,6 +31,7 @@ #include <cpu/x86/multiboot.h> #include <cbmem.h> #include <lib.h> +#include <smbios.h> uint64_t high_tables_base = 0; uint64_t high_tables_size; @@ -120,7 +121,7 @@ struct lb_memory *write_tables(void) #endif /* CONFIG_GENERATE_MP_TABLE */ #if CONFIG_GENERATE_ACPI_TABLES == 1 -#define MAX_ACPI_SIZE (47 * 1024) +#define MAX_ACPI_SIZE (45 * 1024) post_code(0x9c); /* Write ACPI tables to F segment and high tables area */ @@ -178,7 +179,28 @@ struct lb_memory *write_tables(void) } #endif +#define MAX_SMBIOS_SIZE 2048 +#if CONFIG_GENERATE_SMBIOS_TABLES + high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_SMBIOS, MAX_SMBIOS_SIZE); + if (high_table_pointer) { + unsigned long new_high_table_pointer; + new_high_table_pointer = smbios_write_tables(high_table_pointer); + rom_table_end = ALIGN(rom_table_end, 16); + memcpy((void *)rom_table_end, (void *)high_table_pointer, sizeof(struct smbios_entry)); + rom_table_end += sizeof(struct smbios_entry); + + if (new_high_table_pointer > ( high_table_pointer + MAX_SMBIOS_SIZE)) { + printk(BIOS_ERR, "ERROR: Increase SMBIOS size\n"); + } + printk(BIOS_DEBUG, "SMBIOS tables: %ld bytes.\n", + new_high_table_pointer - high_table_pointer); + } else { + unsigned long new_rom_table_end = smbios_write_tables(rom_table_end); + printk(BIOS_DEBUG, "SMBIOS size %ld bytes\n", new_rom_table_end - rom_table_end); + rom_table_end = ALIGN(new_rom_table_end, 16); + } +#endif #define MAX_COREBOOT_TABLE_SIZE (8 * 1024) post_code(0x9d); |