aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-05-10 09:48:55 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-05-10 09:48:55 +0100
commitd9c8338f78137a530e677f007fe673c4d98d79c6 (patch)
tree1960af9dee5faed21112fc73944ec08ab4098282
parentae449980c93fd5ecd5707f5a98d75f525bc6c9ad (diff)
downloadxen-d9c8338f78137a530e677f007fe673c4d98d79c6.tar.gz
xen-d9c8338f78137a530e677f007fe673c4d98d79c6.tar.bz2
xen-d9c8338f78137a530e677f007fe673c4d98d79c6.zip
x86: Relocate boot trampoline to avoid BIOS conflicts.
Fix booting through iSCSI protocol with Broadcom network cards. These boards use the option ROM feature to implement the TCP/IP stack protocol, and the iSCSI software initiator. The memory address normally used by the PMM is 0x87000 which conflicts with the memory allocation for Xen's trampoline routine, currently 0x88000. Relocating down to 0x7c000 fixes the problem. Signed-off-by: Fabio Guarneri <fabioguarneri@gmail.com> xen-unstable changeset: 21276:fd44f1c0d3d6 xen-unstable date: Tue May 04 12:51:33 2010 +0100
-rw-r--r--xen/include/asm-x86/config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 39475da1d7..fc540b6c9c 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -95,7 +95,7 @@
/* Primary stack is restricted to 8kB by guard pages. */
#define PRIMARY_STACK_SIZE 8192
-#define BOOT_TRAMPOLINE 0x88000
+#define BOOT_TRAMPOLINE 0x7c000
#define bootsym_phys(sym) \
(((unsigned long)&(sym)-(unsigned long)&trampoline_start)+BOOT_TRAMPOLINE)
#define bootsym(sym) \