Skip to contentSkip to conversation

fix pxe boot

PATCH In review Christoph Egger 2 participants 4 messages May 11, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix pxe boot

Hi,

Attached patch unbreaks PXE boot.
It effectively backs out c/s 19146.

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
xen/arch/x86/Makefile +0 -1
diff -r 2656ab6fa828 xen/arch/x86/Makefile
@@ -92,4 +92,3 @@ boot/mkelf32: boot/mkelf32.c
 clean::
 	rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32
 	rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d
-	rm -f boot/reloc.S boot/reloc.lnk boot/reloc.bin
xen/arch/x86/boot/Makefile +0 -6
diff -r 2656ab6fa828 xen/arch/x86/boot/Makefile
@@ -1,7 +1,1 @@
 obj-y += head.o
-
-head.o: reloc.S
-
-# NB. BOOT_TRAMPOLINE == 0x8c000
-%.S: %.c
-	RELOC=0x8c000 $(MAKE) -f build32.mk $@
xen/arch/x86/boot/build32.mk deleted +0 -25
diff -r 2656ab6fa828 xen/arch/x86/boot/build32.mk
@@ -1,25 +0,0 @@
-XEN_ROOT=../../../..
-override XEN_TARGET_ARCH=x86_32
-CFLAGS =
-include $(XEN_ROOT)/Config.mk
-
-# Disable PIE/SSP if GCC supports them. They can break us.
-$(call cc-option-add,CFLAGS,CC,-nopie)
-$(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
-$(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
-
-CFLAGS += -Werror -fno-builtin -msoft-float
-
-# NB. awk invocation is a portable alternative to 'head -n -1'
-%.S: %.bin
-	(od -v -t x $< | awk 'NR > 1 {print s} {s=$$0}' | \
-	sed 's/ /,0x/g' | sed 's/^[0-9]*,/ .long /') >$@
-
-%.bin: %.lnk
-	$(OBJCOPY) -O binary $< $@
-
-%.lnk: %.o
-	$(LD) $(LDFLAGS_DIRECT) -N -Ttext 0x8c000 -o $@ $<
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
xen/arch/x86/boot/head.S +2 -8
diff -r 2656ab6fa828 xen/arch/x86/boot/head.S
@@ -79,11 +79,8 @@ __start:
         cmp     $0x2BADB002,%eax
         jne     not_multiboot
 
-        /* Save the Multiboot info struct (after relocation) for later use. */
-        mov     $sym_phys(cpu0_stack)+1024,%esp
-        push    %ebx
-        call    reloc
-        mov     %eax,sym_phys(multiboot_ptr)
+        /* Save the Multiboot info structure for later use. */
+        mov     %ebx,sym_phys(multiboot_ptr)
 
         /* Initialize BSS (no nasty surprises!) */
         mov     $sym_phys(__bss_start),%edi
@@ -195,9 +192,6 @@ 2:      cmp     $L1_PAGETABLE_ENTRIES,%e
 
 #include "cmdline.S"
 
-reloc:
-#include "reloc.S"
-
         .align 16
         .globl trampoline_start, trampoline_end
 trampoline_start:
xen/arch/x86/boot/reloc.c deleted +0 -89

89 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 2 lines · Christoph Egger

Attached patch unbreaks PXE boot.
It effectively backs out c/s 19146.

PXE boot does generally work -- we boot all our systems via pxelinux and its mboot.c32 module. At this point we'll have to target a fix for your setup for 3.4.1, as 3.4.0 is locked down now.

-- Keir

#2 lore raw
Quoted 7 lines · On Monday 11 May 2009 16:36:01 Keir Fraser wrote:
Quoted 2 lines · Christoph Egger

Attached patch unbreaks PXE boot.
It effectively backs out c/s 19146.

PXE boot does generally work -- we boot all our systems via pxelinux and its mboot.c32 module. At this point we'll have to target a fix for your setup for 3.4.1, as 3.4.0 is locked down now.

I use pxegrub.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#3 lore raw
Quoted 5 lines · Christoph Egger
Quoted 3 lines

PXE boot does generally work -- we boot all our systems via pxelinux and its mboot.c32 module. At this point we'll have to target a fix for your setup for 3.4.1, as 3.4.0 is locked down now.

I use pxegrub.

Hmm, maybe I can set that up at home and give it a try. I f I can repro it then it won't be hard to fix.

-- Keir