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

next part of YhLu's large patch. I am not sure whether the tables.c 

changes are correct. If someone could look into this, thank you.

Signed-off-by: Yinghai Lu <yinghai.lu@amd.com>
Signed-off-by: Ed Swierk <eswierk@arastra.com>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ward Vandewege <ward@gnu.org>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2593 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Yinghai Lu 2007-04-06 20:27:40 +00:00 committed by Stefan Reinauer
parent ad9a2c63ef
commit 47cb7c71c9
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/i386/boot/linuxbios_table.c
View File

@ -364,6 +364,17 @@ unsigned long write_linuxbios_table(
head = lb_table_init(low_table_end); head = lb_table_init(low_table_end);
low_table_end = (unsigned long)head; low_table_end = (unsigned long)head;
} }
printk_debug("Adjust low_table_end from 0x%08x to ", low_table_end);
low_table_end += 0xfff; // 4K aligned
low_table_end &= ~0xfff;
printk_debug("0x%08x \n", low_table_end);
/* The Linux kernel assumes this region is reserved */
printk_debug("Adjust rom_table_end from 0x%08x to ", rom_table_end);
rom_table_end += 0xffff; // 64K align
rom_table_end &= ~0xffff;
printk_debug("0x%08x \n", rom_table_end);
#if (HAVE_OPTION_TABLE == 1) #if (HAVE_OPTION_TABLE == 1)
{ {

56
src/arch/i386/boot/tables.c
View File

@ -41,7 +41,7 @@ struct lb_memory *write_tables(void)
unsigned long low_table_start, low_table_end, new_low_table_end; unsigned long low_table_start, low_table_end, new_low_table_end;
unsigned long rom_table_start, rom_table_end; unsigned long rom_table_start, rom_table_end;
rom_table_start = 0xf0000; rom_table_start = 0xf0000;
rom_table_end = 0xf0000; rom_table_end = 0xf0000;
/* Start low addr at 16 bytes instead of 0 because of a buglet /* Start low addr at 16 bytes instead of 0 because of a buglet
* in the generic linux unzip code, as it tests for the a20 line. * in the generic linux unzip code, as it tests for the a20 line.
@ -58,8 +58,7 @@ struct lb_memory *write_tables(void)
/* Write ACPI tables */ /* Write ACPI tables */
/* write them in the rom area because DSDT can be large (8K on epia-m) which /* write them in the rom area because DSDT can be large (8K on epia-m) which
* pushes linuxbios table out of first 4K if set up in low table area * pushes linuxbios table out of first 4K if set up in low table area
*/ */
rom_table_end = write_acpi_tables(rom_table_end); rom_table_end = write_acpi_tables(rom_table_end);
rom_table_end = (rom_table_end+1023) & ~1023; rom_table_end = (rom_table_end+1023) & ~1023;
@ -67,36 +66,36 @@ struct lb_memory *write_tables(void)
post_code(0x96); post_code(0x96);
/* The smp table must be in 0-1K, 639K-640K, or 960K-1M */ /* The smp table must be in 0-1K, 639K-640K, or 960K-1M */
new_low_table_end = write_smp_table(low_table_end); new_low_table_end = write_smp_table(low_table_end); // low_table_end is 0x10 at this point
#if HAVE_MP_TABLE==1 #if HAVE_MP_TABLE==1
/* Don't write anything in the traditional x86 BIOS data segment, /* Don't write anything in the traditional x86 BIOS data segment,
* for example the linux kernel smp need to use 0x467 to pass reset vector * for example the linux kernel smp need to use 0x467 to pass reset vector
*/ */
if(new_low_table_end>0x467){ if(new_low_table_end>0x467){
unsigned mptable_size = new_low_table_end - low_table_end - SMP_FLOATING_TABLE_LEN; unsigned mptable_size;
/* We can not put mptable here, we need to copy them to somewhere else*/ unsigned mpc_start;
if((rom_table_end+mptable_size)<0x100000) { low_table_end += SMP_FLOATING_TABLE_LEN; /* keep the mpf in 1k low, so kernel can find it */
/* We can copy mptable on rom_table, and leave low space for lbtable */ mptable_size = new_low_table_end - low_table_end;
printk_debug("move mptable to 0x%0x\n", rom_table_end); /* We can not put mptable low, we need to copy them to somewhere else*/
memcpy((unsigned char *)rom_table_end, (unsigned char *)(low_table_end+SMP_FLOATING_TABLE_LEN), mptable_size); if((rom_table_end+mptable_size)<0x100000) {
memset((unsigned char *)low_table_end, '\0', mptable_size + SMP_FLOATING_TABLE_LEN); /* We can copy mptable on rom_table */
smp_write_floating_table_physaddr(low_table_end, rom_table_end); mpc_start = rom_table_end;
low_table_end += SMP_FLOATING_TABLE_LEN; rom_table_end += mptable_size;
rom_table_end += mptable_size; rom_table_end = (rom_table_end+1023) & ~1023;
rom_table_end = (rom_table_end+1023) & ~1023; } else {
} else { /* We can need to put mptable before rom_table */
/* We can need to put mptable low and from 0x500 */ mpc_start = rom_table_start - mptable_size;
printk_debug("move mptable to 0x%0x\n", 0x500); mpc_start &= ~1023;
memcpy((unsigned char *)0x500, (unsigned char *)(low_table_end+SMP_FLOATING_TABLE_LEN), mptable_size); rom_table_start = mpc_start;
memset((unsigned char *)low_table_end, '\0', 0x500-low_table_end); }
smp_write_floating_table_physaddr(low_table_end, 0x500); printk_debug("move mptable from 0x%0x to 0x%0x, size 0x%0x\n", low_table_end, mpc_start, mptable_size);
low_table_end = 0x500 + mptable_size; memcpy((unsigned char *)mpc_start, (unsigned char *)low_table_end, mptable_size);
} smp_write_floating_table_physaddr(low_table_end - SMP_FLOATING_TABLE_LEN, mpc_start);
} memset((unsigned char *)low_table_end, '\0', mptable_size);
#endif }
#endif
/* Don't write anything in the traditional x86 BIOS data segment */
if (low_table_end < 0x500) { if (low_table_end < 0x500) {
low_table_end = 0x500; low_table_end = 0x500;
} }
@ -106,8 +105,7 @@ struct lb_memory *write_tables(void)
low_table_end += &gdt_end - &gdt; low_table_end += &gdt_end - &gdt;
/* The linuxbios table must be in 0-4K or 960K-1M */ /* The linuxbios table must be in 0-4K or 960K-1M */
write_linuxbios_table( write_linuxbios_table(low_table_start, low_table_end,
low_table_start, low_table_end,
rom_table_start, rom_table_end); rom_table_start, rom_table_end);
return get_lb_mem(); return get_lb_mem();