[coreboot] [v2] r4220 - trunk/coreboot-v2/src/arch/i386/boot

[svn at coreboot.org]

Author: ward
Date: 2009-04-27 22:00:29 +0200 (Mon, 27 Apr 2009)
New Revision: 4220

Modified:
   trunk/coreboot-v2/src/arch/i386/boot/tables.c
Log:

Special handling for MP table in low memory is only necessary if there are
tables in low memory.

This removes a hang when HAVE_LOW_TABLES=0 and HAVE_HIGH_TABLES=1. With this
patch I can boot all the way to a payload. Tested on a Supermicro H8DME.

Many thanks to Patrick Georgi for figuring this out.

Signed-off-by: Ward Vandewege <ward at gnu.org>
Acked-by: Myles Watson <mylesgw at gmail.com>



Modified: trunk/coreboot-v2/src/arch/i386/boot/tables.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/tables.c	2009-04-27 18:31:09 UTC (rev 4219)
+++ trunk/coreboot-v2/src/arch/i386/boot/tables.c	2009-04-27 20:00:29 UTC (rev 4220)
@@ -137,14 +137,6 @@
 	/* The smp table must be in 0-1K, 639K-640K, or 960K-1M */
 #if HAVE_LOW_TABLES == 1
 	new_low_table_end = write_smp_table(low_table_end); // low_table_end is 0x10 at this point
-#endif
-#if HAVE_HIGH_TABLES == 1
-	if (high_tables_base) {
-		high_table_end = write_smp_table(high_table_end);
-		high_table_end = (high_table_end+1023) & ~1023;
-	}
-#endif
-
         /* 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
          * or use 0x40e/0x413 for EBDA finding...
@@ -171,6 +163,14 @@
 		smp_write_floating_table_physaddr(low_table_end - SMP_FLOATING_TABLE_LEN, mpc_start);
 		memset((unsigned char *)low_table_end, '\0', mptable_size);
 	}
+#endif /* HAVE_LOW_TABLES */
+
+#if HAVE_HIGH_TABLES == 1
+	if (high_tables_base) {
+		high_table_end = write_smp_table(high_table_end);
+		high_table_end = (high_table_end+1023) & ~1023;
+	}
+#endif
 #endif /* HAVE_MP_TABLE */
 
 	if (low_table_end < 0x500) {