Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jLCXO-0004xJ-4H for mharc-grub-devel@gnu.org; Sun, 05 Apr 2020 17:10:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53181) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLCXL-0004xD-Qr for grub-devel@gnu.org; Sun, 05 Apr 2020 17:10:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLCXE-0000zA-Mw for grub-devel@gnu.org; Sun, 05 Apr 2020 17:10:35 -0400 Received: from static-108-31-38-18.washdc.fios.verizon.net ([108.31.38.18]:45471 helo=mail.metricspace.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jLCXE-0000yq-IC for grub-devel@gnu.org; Sun, 05 Apr 2020 17:10:28 -0400 Received: from neutron.metricspace.net (unknown [IPv6:2001:470:1f11:617:3210:b3ff:fe77:ca3f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: eric) by mail.metricspace.net (Postfix) with ESMTPSA id C22E65593; Sun, 5 Apr 2020 21:10:27 +0000 (UTC) From: eric@metricspace.net To: grub-devel@gnu.org Cc: Eric McCorkle Subject: [PATCH] Add functionality for passing information to FreeBSD kernel Date: Sun, 5 Apr 2020 17:10:05 -0400 Message-Id: <20200405211005.28385-1-eric@metricspace.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 108.31.38.18 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2020 21:10:37 -0000 From: Eric McCorkle Fixes GRUB with FreeBSD to pass EFI frame buffer info into the kernel at = boot. --- grub-core/loader/i386/bsd.c | 81 ++++++++++++++++++++++++++++++ include/grub/i386/freebsd_linker.h | 9 ++++ 2 files changed, 90 insertions(+) diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c index eb82391db..d3dc1d27f 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -76,6 +76,21 @@ static grub_uint32_t openbsd_root; static struct grub_relocator *relocator =3D NULL; static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk; =20 +#ifdef GRUB_MACHINE_EFI +struct freebsd_efi_fb +{ + grub_uint64_t fb_addr; + grub_uint64_t fb_size; + grub_uint32_t fb_height; + grub_uint32_t fb_width; + grub_uint32_t fb_stride; + grub_uint32_t fb_mask_red; + grub_uint32_t fb_mask_green; + grub_uint32_t fb_mask_blue; + grub_uint32_t fb_mask_reserved; +}; +#endif + struct bsd_tag { struct bsd_tag *next; @@ -591,6 +606,63 @@ freebsd_get_zfs (void) grub_free (uuid); } =20 +static grub_err_t +grub_freebsd_setup_fw_handle (void) +{ + grub_err_t err =3D GRUB_ERR_NONE; +#ifdef GRUB_MACHINE_EFI + + /* Add EFI firmware handle */ + err =3D grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | + FREEBSD_MODINFOMD_FW_HANDLE, + &grub_efi_system_table, + sizeof (grub_efi_system_table)); +#endif + return err; +} + +static grub_err_t +grub_freebsd_setup_video (void) +{ + grub_err_t err =3D GRUB_ERR_NONE; + +#ifdef GRUB_MACHINE_EFI + + /* Add EFI frame buffer info */ + struct freebsd_efi_fb efifb; + struct grub_video_mode_info mode_info; + void *framebuffer; + + err =3D grub_video_get_info_and_fini (&mode_info, &framebuffer); + + if (err) + return err; + + efifb.fb_addr =3D (grub_addr_t) framebuffer; + efifb.fb_height =3D mode_info.height; + efifb.fb_width =3D mode_info.width; + efifb.fb_stride =3D mode_info.pitch / mode_info.bytes_per_pixel; + efifb.fb_size =3D mode_info.height * mode_info.pitch; + efifb.fb_mask_red =3D + ((1 << mode_info.red_mask_size) - 1) << + mode_info.red_field_pos; + efifb.fb_mask_green =3D + ((1 << mode_info.green_mask_size) - 1) << + mode_info.green_field_pos; + efifb.fb_mask_blue =3D + ((1 << mode_info.blue_mask_size) - 1) << + mode_info.blue_field_pos; + efifb.fb_mask_reserved =3D + ((1 << mode_info.reserved_mask_size) - 1) << + mode_info.reserved_field_pos; + err =3D grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | + FREEBSD_MODINFOMD_EFI_FB, + &efifb, sizeof (efifb)); +#endif + + return err; +} + static grub_err_t grub_freebsd_boot (void) { @@ -1563,11 +1635,20 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int= argc, char *argv[]) if (err) return err; =20 + err =3D grub_freebsd_setup_fw_handle (); + if (err) + return err; + + err =3D grub_freebsd_setup_video (); + if (err) + return err; + err =3D grub_bsd_add_meta (FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_KERNEND, &data, len); if (err) return err; } + grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part); freebsd_zfsguid =3D 0; if (!is_64bit) diff --git a/include/grub/i386/freebsd_linker.h b/include/grub/i386/freeb= sd_linker.h index 3c1eb64b6..2dab21678 100644 --- a/include/grub/i386/freebsd_linker.h +++ b/include/grub/i386/freebsd_linker.h @@ -65,9 +65,18 @@ #define FREEBSD_MODINFOMD_HOWTO 0x0007 /* boothowto */ #define FREEBSD_MODINFOMD_KERNEND 0x0008 /* kernend */ #define FREEBSD_MODINFOMD_SHDR 0x0009 /* section header table */ +#define FREEBSD_MODINFOMD_CTORS_ADDR 0x000a /* address of .ctors */ +#define FREEBSD_MODINFOMD_CTORS_SIZE 0x000b /* size of .ctors */ +#define FREEBSD_MODINFOMD_FW_HANDLE 0x000c /* firmware dependent ha= ndle */ +#define FREEBSD_MODINFOMD_KEYBUF 0x000d /* crypto key intake buf= fer */ #define FREEBSD_MODINFOMD_NOCOPY 0x8000 /* don't copy this metadata to t= he kernel */ =20 #define FREEBSD_MODINFOMD_SMAP 0x1001 +#define FREEBSD_MODINFOMD_SMAP_XATTR 0x1002 +#define FREEBSD_MODINFOMD_DTBP 0x1003 +#define FREEBSD_MODINFOMD_EFI_MAP 0x1004 +#define FREEBSD_MODINFOMD_EFI_FB 0x1005 +#define FREEBSD_MODINFOMD_EFI_MODULEP 0x1006 =20 #define FREEBSD_MODINFOMD_DEPLIST (0x4001 | FREEBSD_MODINFOMD_NOCOPY) /= * depends on */ =20 --=20 2.25.1