瀏覽代碼

[romprefix] Do not fall back to hooking INT19 by default

Several BIOSes (including most IBM BIOSes and many virtual machine
BIOSes) do not provide detectable PnP support, but will use the BEV
entry point for a PnP option ROM.  On these semi-PnP BIOSes, iPXE will
respond to the absence of detectable PnP support by hooking INT19,
which disrupts the boot order.

BIOSes that genuinely require hooking INT19 seem to be very rare
nowadays.  It may therefore be preferable to assume that the absence
of detectable PnP support indicates a semi-PnP BIOS rather than a
non-PnP BIOS.

Change the default behaviour so that INT19 will never be hooked unless
the compile-time option NONPNP_HOOK_INT19 is enabled.  Leave the
redundant PnP detection routine in-place to allow for debugging via
the ROM banner line.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 13 年之前
父節點
當前提交
fcd55f7500
共有 2 個文件被更改,包括 8 次插入0 次删除
  1. 2
    0
      src/arch/i386/prefix/romprefix.S
  2. 6
    0
      src/config/general.h

+ 2
- 0
src/arch/i386/prefix/romprefix.S 查看文件

@@ -286,6 +286,7 @@ pnp_scan:
286 286
 	call	print_message
287 287
 	jmp	pnp_done
288 288
 no_pnp:	/* Not PnP-compliant - hook INT 19 */
289
+#ifdef NONPNP_HOOK_INT19
289 290
 	movw	$init_message_int19, %si
290 291
 	xorw	%di, %di
291 292
 	call	print_message
@@ -296,6 +297,7 @@ no_pnp:	/* Not PnP-compliant - hook INT 19 */
296 297
 	pushw	%gs /* %gs contains runtime %cs */
297 298
 	pushw	$int19_entry
298 299
 	popl	%es:( 0x19 * 4 )
300
+#endif /* NONPNP_HOOK_INT19 */
299 301
 pnp_done:
300 302
 
301 303
 	/* Check for PMM */

+ 6
- 0
src/config/general.h 查看文件

@@ -127,6 +127,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
127 127
 #undef	PXE_CMD			/* PXE commands */
128 128
 #undef	REBOOT_CMD		/* Reboot command */
129 129
 
130
+/*
131
+ * ROM-specific options
132
+ *
133
+ */
134
+#undef	NONPNP_HOOK_INT19	/* Hook INT19 on non-PnP BIOSes */
135
+
130 136
 /*
131 137
  * Error message tables to include
132 138
  *

Loading…
取消
儲存