Rename almost all occurences of LinuxBIOS to coreboot.

[coreboot.git] / src / arch / i386 / boot / tables.c

diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 8abac2b748e9357f59816c9ece429e8f8f8b7f23..417d9a98bbd664a8697c702ee85e06a27885a600 100644 (file)
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -8,6 +8,7 @@
 #include <arch/pirq_routing.h>
 #include <arch/smp/mpspec.h>
 #include <arch/acpi.h>
+#include <string.h>
 #include "linuxbios_table.h"
 
 // Global Descriptor Table, defined in c_start.S
@@ -22,7 +23,7 @@ struct gdtarg {
 
 // Copy GDT to new location and reload it
 // 2003-07 by SONE Takeshi
-// Ported from Etherboot to LinuxBIOS 2005-08 by Steve Magnani
+// Ported from Etherboot to coreboot 2005-08 by Steve Magnani
 void move_gdt(unsigned long newgdt)
 {
        uint16_t num_gdt_bytes = &gdt_end - &gdt;
@@ -41,7 +42,7 @@ struct lb_memory *write_tables(void)
        unsigned long low_table_start, low_table_end, new_low_table_end;
        unsigned long rom_table_start, rom_table_end;
 
-       rom_table_start = 0xf0000;
+       rom_table_start = 0xf0000; 
        rom_table_end =   0xf0000;
        /* 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.
@@ -57,9 +58,8 @@ struct lb_memory *write_tables(void)
 
        /* Write ACPI tables */
        /* 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 coreboot table out of first 4K if set up in low table area 
+        */
        rom_table_end = write_acpi_tables(rom_table_end);
        rom_table_end = (rom_table_end+1023) & ~1023;
 
@@ -67,34 +67,36 @@ struct lb_memory *write_tables(void)
        post_code(0x96);
 
        /* 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
         /* 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
          */
-        if(new_low_table_end>0x467){
-                unsigned mptable_size = new_low_table_end - low_table_end - SMP_FLOATING_TABLE_LEN;
-                /* We can not put mptable here, we need to copy them to somewhere else*/
-                if((rom_table_end+mptable_size)<0x100000) {
-                        /* We can copy mptable on rom_table, and leave low space for lbtable  */
-                        printk_debug("move mptable to 0x%0x\n", rom_table_end);
-                        memcpy((unsigned char *)rom_table_end, (unsigned char *)(low_table_end+SMP_FLOATING_TABLE_LEN), mptable_size);
-                        memset((unsigned char *)low_table_end, '\0', mptable_size + SMP_FLOATING_TABLE_LEN);
-                        smp_write_floating_table_physaddr(low_table_end, rom_table_end);
-                        low_table_end += SMP_FLOATING_TABLE_LEN;
-                        rom_table_end += mptable_size;
-                        rom_table_end = (rom_table_end+1023) & ~1023;
-                } else {
-                        /* We can need to put mptable low and from 0x500 */
-                        printk_debug("move mptable to 0x%0x\n", 0x500);
-                        memcpy((unsigned char *)0x500, (unsigned char *)(low_table_end+SMP_FLOATING_TABLE_LEN), mptable_size);
-                        memset((unsigned char *)low_table_end, '\0', 0x500-low_table_end);
-                        smp_write_floating_table_physaddr(low_table_end, 0x500);
-                        low_table_end = 0x500 + mptable_size;
-                }
-        }
-
-       /* Don't write anything in the traditional x86 BIOS data segment */
+       if(new_low_table_end>0x467){
+               unsigned mptable_size;
+               unsigned mpc_start;
+               low_table_end += SMP_FLOATING_TABLE_LEN; /* keep the mpf in 1k low, so kernel can find it */
+               mptable_size = new_low_table_end - low_table_end;
+               /* We can not put mptable low, we need to copy them to somewhere else*/
+               if((rom_table_end+mptable_size)<0x100000) {
+                       /* We can copy mptable on rom_table  */
+                       mpc_start = rom_table_end;
+                       rom_table_end += mptable_size;
+                       rom_table_end = (rom_table_end+1023) & ~1023;
+               } else {
+                       /* We can need to put mptable before rom_table */
+                       mpc_start = rom_table_start - mptable_size;
+                       mpc_start &= ~1023;
+                       rom_table_start = mpc_start;
+               }
+               printk_debug("move mptable from 0x%0x to 0x%0x, size 0x%0x\n", low_table_end, mpc_start, 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
+
        if (low_table_end < 0x500) {
                low_table_end = 0x500;
        }
@@ -103,9 +105,8 @@ struct lb_memory *write_tables(void)
        move_gdt(low_table_end);
        low_table_end += &gdt_end - &gdt;
 
-       /* The linuxbios table must be in 0-4K or 960K-1M */
-       write_linuxbios_table(
-                             low_table_start, low_table_end,
+       /* The coreboot table must be in 0-4K or 960K-1M */
+       write_coreboot_table(low_table_start, low_table_end,
                              rom_table_start, rom_table_end);
 
        return get_lb_mem();