Skip to contentSkip to conversation

fix linuxboot.bin and multiboot.bin to not hijack int19

PATCH Applied Gleb Natapov 3 participants 3 messages Jan 31, 2011 – Mar 22, 2011

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fix linuxboot.bin and multiboot.bin to not hijack int19

Currently linuxboot.bin and multiboot.bin option roms override int19 vector to intercept boot process. No sane option rom should do that. Provide bev entry instead that will be called by BIOS if option rom is selected for booting.

---

Note that this patch should be applied after qemu will upgrade to Seabios that supports boot order. Otherwise there will be change in behavior since option rom will not be selected for booting by default.

v1->v2:
- change PRODUCT to BOOT_ROM_PRODUCT
- move pnp header from OPTION_ROM_START to BOOT_ROM_START

pc-bios/optionrom/linuxboot.S +2 -0
index c109363..748c831 100644
@@ -22,6 +22,8 @@
 
 #include "optionrom.h"
 
+#define BOOT_ROM_PRODUCT "Linux loader"
+
 BOOT_ROM_START
 
 run_linuxboot:
pc-bios/optionrom/multiboot.S +2 -0
index 9131837..cc5ca1b 100644
@@ -20,6 +20,8 @@
 
 #include "optionrom.h"
 
+#define BOOT_ROM_PRODUCT "multiboot loader"
+
 #define MULTIBOOT_MAGIC		0x2badb002
 
 #define GS_PROT_JUMP		0
pc-bios/optionrom/optionrom.h +25 -15
index fbdd48a..aa783de 100644
@@ -97,22 +97,28 @@
 
 #define BOOT_ROM_START					\
 	OPTION_ROM_START				\
-	push		%eax;				\
-	push		%ds;				\
-							\
-	/* setup ds so we can access the IVT */		\
-	xor		%ax, %ax;			\
-	mov		%ax, %ds;			\
-							\
-	/* install our int 19 handler */		\
-	movw		$int19_handler, (0x19*4);	\
-	mov		%cs, (0x19*4+2);		\
-							\
-	pop		%ds;				\
-	pop		%eax;				\
 	lret;						\
-							\
-    int19_handler:;					\
+	.org 		0x18;				\
+	.short		0;				\
+	.short		_pnph;				\
+    _pnph:						\
+	.ascii		"$PnP";				\
+	.byte		0x01;				\
+	.byte		( _pnph_len / 16 );		\
+	.short		0x0000;				\
+	.byte		0x00;				\
+	.byte		0x00;				\
+	.long		0x00000000;			\
+	.short		_manufacturer;			\
+	.short		_product;			\
+	.long		0x00000000;			\
+	.short		0x0000;				\
+	.short		0x0000;				\
+	.short		_bev;				\
+	.short		0x0000;				\
+	.short		0x0000;				\
+	.equ		_pnph_len, . - _pnph;		\
+    _bev:;						\
 	/* DS = CS */					\
 	movw		%cs, %ax;			\
 	movw		%ax, %ds;
@@ -122,5 +128,9 @@
     _end:
 
 #define BOOT_ROM_END					\
+    _manufacturer:;					\
+	.asciz "QEMU";					\
+    _product:;						\
+	.asciz BOOT_ROM_PRODUCT;			\
 	OPTION_ROM_END
 

--
Gleb.

Acked-by on v2 1/1
#1 lore raw
Quoted 4 lines · Gleb Natapov

Currently linuxboot.bin and multiboot.bin option roms override int19 vector to intercept boot process. No sane option rom should do that. Provide bev entry instead that will be called by BIOS if option rom is selected for booting.

No idea about the bev standard, but the rest looks good :)

Alex

#2 lore raw
In reply to Gleb Natapov
Quoted 8 lines · Gleb Natapov

Currently linuxboot.bin and multiboot.bin option roms override int19 vector to intercept boot process. No sane option rom should do that. Provide bev entry instead that will be called by BIOS if option rom is selected for booting.

---

Quoted 7 lines

Note that this patch should be applied after qemu will upgrade to Seabios that supports boot order. Otherwise there will be change in behavior since option rom will not be selected for booting by default.

v1->v2:
- change PRODUCT to BOOT_ROM_PRODUCT
- move pnp header from OPTION_ROM_START to BOOT_ROM_START

Thanks, applied.

Quoted 88 lines
pc-bios/optionrom/linuxboot.S +2 -0
index c109363..748c831 100644
@@ -22,6 +22,8 @@
 
 #include "optionrom.h"
 
+#define BOOT_ROM_PRODUCT "Linux loader"
+
 BOOT_ROM_START
 
 run_linuxboot:
pc-bios/optionrom/multiboot.S +2 -0
index 9131837..cc5ca1b 100644
@@ -20,6 +20,8 @@
 
 #include "optionrom.h"
 
+#define BOOT_ROM_PRODUCT "multiboot loader"
+
 #define MULTIBOOT_MAGIC		0x2badb002
 
 #define GS_PROT_JUMP		0
pc-bios/optionrom/optionrom.h +25 -16
index fbdd48a..aa783de 100644
@@ -97,22 +97,28 @@
 
 #define BOOT_ROM_START					\
 	OPTION_ROM_START				\
-	push		%eax;				\
-	push		%ds;				\
-							\
-	/* setup ds so we can access the IVT */		\
-	xor		%ax, %ax;			\
-	mov		%ax, %ds;			\
-							\
-	/* install our int 19 handler */		\
-	movw		$int19_handler, (0x19*4);	\
-	mov		%cs, (0x19*4+2);		\
-							\
-	pop		%ds;				\
-	pop		%eax;				\
 	lret;						\
-							\
-    int19_handler:;					\
+	.org 		0x18;				\
+	.short		0;				\
+	.short		_pnph;				\
+    _pnph:						\
+	.ascii		"$PnP";				\
+	.byte		0x01;				\
+	.byte		( _pnph_len / 16 );		\
+	.short		0x0000;				\
+	.byte		0x00;				\
+	.byte		0x00;				\
+	.long		0x00000000;			\
+	.short		_manufacturer;			\
+	.short		_product;			\
+	.long		0x00000000;			\
+	.short		0x0000;				\
+	.short		0x0000;				\
+	.short		_bev;				\
+	.short		0x0000;				\
+	.short		0x0000;				\
+	.equ		_pnph_len, . - _pnph;		\
+    _bev:;						\
 	/* DS = CS */					\
 	movw		%cs, %ax;			\
 	movw		%ax, %ds;
@@ -122,5 +128,9 @@
     _end:
 
 #define BOOT_ROM_END					\
+    _manufacturer:;					\
+	.asciz "QEMU";					\
+    _product:;						\
+	.asciz BOOT_ROM_PRODUCT;			\
 	OPTION_ROM_END
 
--

Gleb.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net