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

2 files changed, 39 insertions, 30 deletions

diff --git a/src/arch/i386/boot/linuxbios_table.c b/src/arch/i386/boot/linuxbios_table.c
index 569692e019..9074d11685 100644
--- a/src/arch/i386/boot/linuxbios_table.c
+++ b/src/arch/i386/boot/linuxbios_table.c
@@ -364,6 +364,17 @@ unsigned long write_linuxbios_table(
 		head = lb_table_init(low_table_end);
 		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) 
 	{
diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index e43d49d124..79ddd07ee0 100644
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -41,7 +41,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.
@@ -58,8 +58,7 @@ 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 
-         */
-
+	 */
 	rom_table_end = write_acpi_tables(rom_table_end);
 	rom_table_end = (rom_table_end+1023) & ~1023;
 
@@ -67,36 +66,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;
-                }
-        }
-#endif 
-
-	/* 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;
 	}
@@ -106,8 +105,7 @@ struct lb_memory *write_tables(void)
 	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,
+	write_linuxbios_table(low_table_start, low_table_end,
 			      rom_table_start, rom_table_end);
 
 	return get_lb_mem();