david/ipxe
Archived
1
0

[romprefix] Inhibit the use of relocation during POST

It is common for system memory maps to be grotesquely unreliable
during POST.  Many sanity checks have been added to the memory map
reading code, but these do not catch all problems.

Skip relocation entirely if called during POST.  This should avoid the
problems typically encountered, at the cost of slightly disrupting the
memory map of an operating system booted via iPXE when iPXE was
entered during POST.  Since this is a very rare special case (used,
for example, when reflashing an experimental ROM that would otherwise
prevent the system from completing POST), this is an acceptable cost.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-04-25 01:37:25 +01:00
parent c97079710f
commit 5a5d8dd10a
3 changed files with 25 additions and 6 deletions

View File

@ -443,6 +443,8 @@ install:
xorl %esi, %esi xorl %esi, %esi
/* Image destination = default */ /* Image destination = default */
xorl %edi, %edi xorl %edi, %edi
/* Allow relocation */
clc
/* Install text and data segments */ /* Install text and data segments */
call install_prealloc call install_prealloc
/* Restore registers and return */ /* Restore registers and return */
@ -461,6 +463,7 @@ install:
* %bx : .data16 segment address * %bx : .data16 segment address
* %esi : Image source physical address (or zero for %cs:0000) * %esi : Image source physical address (or zero for %cs:0000)
* %edi : Decompression temporary area physical address (or zero for default) * %edi : Decompression temporary area physical address (or zero for default)
* CF set : Avoid relocating to top of memory
* Corrupts: * Corrupts:
* none * none
**************************************************************************** ****************************************************************************
@ -473,9 +476,8 @@ install_prealloc:
pushal pushal
pushw %ds pushw %ds
pushw %es pushw %es
cld /* Sanity: clear the direction flag asap */
/* Sanity: clear the direction flag asap */ pushfw
cld
/* Copy decompression temporary area physical address to %ebp */ /* Copy decompression temporary area physical address to %ebp */
movl %edi, %ebp movl %edi, %ebp
@ -570,6 +572,11 @@ a20_death_message:
movl %ebp, %edi movl %ebp, %edi
lcall *init_librm_vector lcall *init_librm_vector
/* Skip relocation if CF was set on entry */
popfw
pushfw
jc skip_relocate
/* Call relocate() to determine target address for relocation. /* Call relocate() to determine target address for relocation.
* relocate() will return with %esi, %edi and %ecx set up * relocate() will return with %esi, %edi and %ecx set up
* ready for the copy to the new location. * ready for the copy to the new location.
@ -588,9 +595,11 @@ a20_death_message:
/* Initialise librm at new location */ /* Initialise librm at new location */
lcall *init_librm_vector lcall *init_librm_vector
skip_relocate:
#endif #endif
/* Restore registers */ /* Restore registers */
popfw
popw %es popw %es
popw %ds popw %ds
popal popal

View File

@ -407,6 +407,7 @@ no_pmm:
* picked up by the initial shell prompt, and we will drop * picked up by the initial shell prompt, and we will drop
* into a shell. * into a shell.
*/ */
stc /* Inhibit relocation */
pushw %cs pushw %cs
call exec call exec
2: 2:
@ -597,6 +598,7 @@ bbs_version:
* Called by the PnP BIOS when it wants to boot us. * Called by the PnP BIOS when it wants to boot us.
*/ */
bev_entry: bev_entry:
clc /* Allow relocation */
pushw %cs pushw %cs
call exec call exec
lret lret
@ -631,6 +633,7 @@ int19_entry:
/* Leave keypress in buffer and start iPXE. The keypress will /* Leave keypress in buffer and start iPXE. The keypress will
* cause the usual initial Ctrl-B prompt to be skipped. * cause the usual initial Ctrl-B prompt to be skipped.
*/ */
clc /* Allow relocation */
pushw %cs pushw %cs
call exec call exec
1: /* Try to call original INT 19 vector */ 1: /* Try to call original INT 19 vector */
@ -662,6 +665,9 @@ exec: /* Set %ds = %cs */
pushw %cs pushw %cs
popw %ds popw %ds
/* Preserve state of CF */
lahf
/* Print message as soon as possible */ /* Print message as soon as possible */
movw $prodstr, %si movw $prodstr, %si
xorw %di, %di xorw %di, %di
@ -675,14 +681,17 @@ exec: /* Set %ds = %cs */
movw %sp, %bp movw %sp, %bp
/* Obtain a reasonably-sized temporary stack */ /* Obtain a reasonably-sized temporary stack */
xorw %ax, %ax xorw %bx, %bx
movw %ax, %ss movw %bx, %ss
movw $0x7c00, %sp movw $0x7c00, %sp
/* Install iPXE */ /* Install iPXE */
sahf
pushfw
call alloc_basemem
popfw
movl image_source, %esi movl image_source, %esi
movl decompress_to, %edi movl decompress_to, %edi
call alloc_basemem
call install_prealloc call install_prealloc
/* Print message indicating successful installation */ /* Print message indicating successful installation */

View File

@ -28,6 +28,7 @@ undiloader:
movw %es:14(%di), %ax movw %es:14(%di), %ax
movl image_source, %esi movl image_source, %esi
movl decompress_to, %edi movl decompress_to, %edi
clc /* Allow relocation */
call install_prealloc call install_prealloc
popw %di popw %di
/* Call UNDI loader C code */ /* Call UNDI loader C code */