summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWard Vandewege <ward@gnu.org>2009-04-27 20:00:29 +0000
committerWard Vandewege <ward@gnu.org>2009-04-27 20:00:29 +0000
commit2d0b93bb54ba3bf8c693fc7c80f1ec1e7bff65da (patch)
tree32053d78c9e599ca8c8ed6b1f713060542c71fca /src
parent1670857cc9f0958e4b78b08bfcc0b91c53c7f2c8 (diff)
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@gnu.org> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4220 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/boot/tables.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 6959ae3036..7e6903f0f7 100644
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -137,14 +137,6 @@ struct lb_memory *write_tables(void)
/* 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 @@ struct lb_memory *write_tables(void)
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) {