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>

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 39475da1d7124bed27d42d532d8fcbc854dd4481..fc540b6c9cdc1130aa3f111078297b3c55e7a422 100644 (file)
--- 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)                                      \