GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This patch adds "high coreboot table support" to coreboot version 2. 

Some bootloaders seem to overwrite memory starting at 0x600, thus destroying
the coreboot table integrity, rendering the table useless.

By moving the table to the high tables area (if it's activated), this problem
is fixed.

In order to move the table, a 40 bytes mini coreboot table with a single sub
table is placed at 0x500/0x530 that points to the real coreboot table. This is
comparable to the ACPI RSDT or the MP floating table.

This patch also adds "table forward" support to flashrom and nvramtool.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>




git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4012 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-03-17 14:39:25 +00:00 committed by Stefan Reinauer
parent efab4ba3bb
commit 3f72e32b06
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
util/flashrom/cbtable.c
View File

@ -4,7 +4,7 @@
* Copyright (C) 2002 Steven James <pyro@linuxlabs.com> * Copyright (C) 2002 Steven James <pyro@linuxlabs.com>
* Copyright (C) 2002 Linux Networx * Copyright (C) 2002 Linux Networx
* (Written by Eric Biederman <ebiederman@lnxi.com> for Linux Networx) * (Written by Eric Biederman <ebiederman@lnxi.com> for Linux Networx)
* Copyright (C) 2006-2007 coresystems GmbH * Copyright (C) 2006-2009 coresystems GmbH
* (Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH) * (Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH)
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -124,7 +124,7 @@ static struct lb_header *find_lb_table(void *base, unsigned long start,
head->table_checksum); head->table_checksum);
continue; continue;
} }
fprintf(stdout, "Found coreboot table at 0x%08lx.\n", addr); printf_debug("Found coreboot table at 0x%08lx.\n", addr);
return head; return head;
}; };
@ -181,9 +181,10 @@ static void search_lb_records(struct lb_record *rec, struct lb_record *last,
} }
} }
#define BYTES_TO_MAP (1024*1024)
int coreboot_init(void) int coreboot_init(void)
{ {
uint8_t *low_1MB; uint8_t *table_area;
unsigned long addr, start; unsigned long addr, start;
struct lb_header *lb_table; struct lb_header *lb_table;
struct lb_record *rec, *last; struct lb_record *rec, *last;
@ -196,18 +197,31 @@ int coreboot_init(void)
#else #else
start = 0x0; start = 0x0;
#endif #endif
low_1MB = physmap("low megabyte", start, 1024*1024); table_area = physmap("low megabyte", start, BYTES_TO_MAP);
lb_table = find_lb_table(low_1MB, 0x00000, 0x1000); lb_table = find_lb_table(table_area, 0x00000, 0x1000);
if (!lb_table) if (!lb_table)
lb_table = find_lb_table(low_1MB, 0xf0000, 1024*1024); lb_table = find_lb_table(table_area, 0xf0000, BYTES_TO_MAP);
if (lb_table) {
struct lb_forward *forward = (struct lb_forward *)
(((char *)lb_table) + lb_table->header_bytes);
if (forward->tag == LB_TAG_FORWARD) {
start = forward->forward;
start &= ~(getpagesize()-1);
physunmap(table_area, BYTES_TO_MAP);
table_area = physmap("high tables", start, BYTES_TO_MAP);
lb_table = find_lb_table(table_area, 0x00000, 0x1000);
}
}
if (!lb_table) { if (!lb_table) {
printf("No coreboot table found.\n"); printf("No coreboot table found.\n");
return -1; return -1;
} }
addr = ((char *)lb_table) - ((char *)low_1MB) + start; addr = ((char *)lb_table) - ((char *)table_area) + start;
printf_debug("coreboot table found at %p.\n", lb_table + start); fprintf(stdout, "coreboot table found at 0x%lx.\n",
(unsigned long)lb_table - (unsigned long)table_area + start);
rec = (struct lb_record *)(((char *)lb_table) + lb_table->header_bytes); rec = (struct lb_record *)(((char *)lb_table) + lb_table->header_bytes);
last = (struct lb_record *)(((char *)rec) + lb_table->table_bytes); last = (struct lb_record *)(((char *)rec) + lb_table->table_bytes);
printf_debug("coreboot header(%d) checksum: %04x table(%d) checksum: %04x entries: %d\n", printf_debug("coreboot header(%d) checksum: %04x table(%d) checksum: %04x entries: %d\n",

7
util/flashrom/coreboot_tables.h
View File

@ -135,6 +135,13 @@ struct lb_string {
uint8_t string[0]; uint8_t string[0];
}; };
#define LB_TAG_FORWARD 0x0011
struct lb_forward {
uint32_t tag;
uint32_t size;
uint64_t forward;
};
/* The following structures are for the cmos definitions table */ /* The following structures are for the cmos definitions table */
#define LB_TAG_CMOS_OPTION_TABLE 200 #define LB_TAG_CMOS_OPTION_TABLE 200
/* cmos header record */ /* cmos header record */