vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Pass PCIINFO on BIOS to OpenBSD since otherwise it fails to boot

Browse source 
on some qemu versions with GRUB.

	* include/grub/i386/openbsd_bootarg.h (OPENBSD_BOOTARG_PCIBIOS): New
	define.
	(grub_openbsd_bootarg_pcibios): New struct.
	* grub-core/loader/i386/bsd.c (grub_openbsd_boot) [GRUB_MACHINE_PCBIOS]:
	Add PCIINFO.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-07 16:41:52 +02:00
parent 08a14e0b71
commit c5c81ff978
3 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2012-06-07 Vladimir Serbinenko <phcoder@gmail.com>
Pass PCIINFO on BIOS to OpenBSD since otherwise it fails to boot
on some qemu versions with GRUB.
* include/grub/i386/openbsd_bootarg.h (OPENBSD_BOOTARG_PCIBIOS): New
define.
(grub_openbsd_bootarg_pcibios): New struct.
* grub-core/loader/i386/bsd.c (grub_openbsd_boot) [GRUB_MACHINE_PCBIOS]:
Add PCIINFO.
2012-06-07 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-07 Vladimir Serbinenko <phcoder@gmail.com>
* tests/util/grub-shell.in: Trim firmware output on EFI. * tests/util/grub-shell.in: Trim firmware output on EFI.

32
grub-core/loader/i386/bsd.c
View file

@ -35,6 +35,9 @@
#include <grub/ns8250.h> #include <grub/ns8250.h>
#include <grub/bsdlabel.h> #include <grub/bsdlabel.h>
#include <grub/crypto.h> #include <grub/crypto.h>
#ifdef GRUB_MACHINE_PCBIOS
#include <grub/machine/int.h>
#endif
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -809,6 +812,35 @@ grub_openbsd_boot (void)
if (err) if (err)
return err; return err;
#ifdef GRUB_MACHINE_PCBIOS
{
struct grub_bios_int_registers regs;
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
regs.ebx = 0;
regs.ecx = 0;
regs.eax = 0xb101;
regs.es = 0;
regs.edi = 0;
regs.edx = 0;
grub_bios_interrupt (0x1a, &regs);
if (regs.edx == 0x20494350)
{
struct grub_openbsd_bootarg_pcibios pcibios;
pcibios.characteristics = regs.eax & 0xff;
pcibios.revision = regs.ebx & 0xffff;
pcibios.pm_entry = regs.edi;
pcibios.last_bus = regs.ecx & 0xff;
grub_bsd_add_meta (OPENBSD_BOOTARG_PCIBIOS, &pcibios,
sizeof (pcibios));
}
}
#endif
{ {
struct bsd_tag *tag; struct bsd_tag *tag;
tag_buf_len = 0; tag_buf_len = 0;

9
include/grub/i386/openbsd_bootarg.h
View file

@ -61,6 +61,7 @@
#define OPENBSD_BOOTARG_END -1 #define OPENBSD_BOOTARG_END -1
#define OPENBSD_BOOTARG_MMAP 0 #define OPENBSD_BOOTARG_MMAP 0
#define OPENBSD_BOOTARG_PCIBIOS 4
#define OPENBSD_BOOTARG_CONSOLE 5 #define OPENBSD_BOOTARG_CONSOLE 5
struct grub_openbsd_bootargs struct grub_openbsd_bootargs
@ -76,6 +77,14 @@ struct grub_openbsd_bootarg_console
grub_uint32_t speed; grub_uint32_t speed;
}; };
struct grub_openbsd_bootarg_pcibios
{
grub_uint32_t characteristics;
grub_uint32_t revision;
grub_uint32_t pm_entry;
grub_uint32_t last_bus;
};
#define GRUB_OPENBSD_COM_MAJOR 8 #define GRUB_OPENBSD_COM_MAJOR 8
#define GRUB_OPENBSD_VGA_MAJOR 12 #define GRUB_OPENBSD_VGA_MAJOR 12