Add support for passing EFI framebuffer into FreeBSD 10.1 and later
PATCH 1/1 Add support for passing EFI framebuffer into FreeBSD 10.1 and later
Got another patch for review today.
This patch adds support for FreeBSD's new VT console driver when booting in EFI mode on FreeBSD 10.1 and later.
Please let me know any comments, or things that need addressed to get this merged in.
Thanks!
Signature · 3 lines
Kris Moore PC-BSD Software iXsystems
From a9c20c1640cdea0ba902095cb18760f5ebe98875 Mon Sep 17 00:00:00 2001
From: Kris Moore <[email protected]>
Date: Tue, 28 Oct 2014 15:59:59 -0400
Subject: [PATCH 1/2] Add support for passing EFI framebuffer information to
FreeBSD kernel on FreeBSD 10.1 and later.
--- grub-core/loader/i386/bsd.c | 75 ++++++++++++++++++++++++++++++++++++ grub-core/video/efi_gop.c | 14 +++++++ include/grub/i386/bsd.h | 1 + include/grub/i386/freebsd_bootinfo.h | 33 ++++++++++++++++ include/grub/video.h | 18 +++++++++ 5 files changed, 141 insertions(+) create mode 100644 include/grub/i386/freebsd_bootinfo.h
loader/i386/bsd.c +75 -0
@@ -48,6 +48,7 @@ GRUB_MOD_LICENSE ("GPLv3+");#ifdef GRUB_MACHINE_EFI #include <grub/efi/efi.h> #define NETBSD_DEFAULT_VIDEO_MODE "800x600" +#define FREEBSD_DEFAULT_VIDEO_MODE "800x600"#else #define NETBSD_DEFAULT_VIDEO_MODE "text"#include <grub/i386/pc/vbe.h>
@@ -584,6 +585,63 @@ freebsd_get_zfs (void)grub_free (uuid); } +#ifdef GRUB_MACHINE_EFI + +static grub_err_t +grub_freebsd_setup_video (void ) +{ +struct grub_video_mode_info mode_info; +void *framebuffer; +const char *modevar; +struct grub_freebsd_btinfo_framebuf efifb; +grub_err_t err; +grub_video_driver_id_t driv_id; + + modevar =grub_env_get ("gfxpayload" ); + +/* Now all graphical modes are acceptable. +May change in future if we have modes without framebuffer. */ +if (modevar && *modevar !=0 ) + { +char *tmp; + tmp =grub_xasprintf ("%s;" FREEBSD_DEFAULT_VIDEO_MODE , modevar); +if (! tmp) +return grub_errno; + err =grub_video_set_mode (tmp,0 ,0 ); +grub_free (tmp); + } +else + err =grub_video_set_mode (FREEBSD_DEFAULT_VIDEO_MODE ,0 ,0 ); + +if (err) +return err; + + driv_id =grub_video_get_driver_id (); +if (driv_id ==GRUB_VIDEO_DRIVER_NONE ) +return GRUB_ERR_NONE ; + + err =grub_video_get_info_and_fini (&mode_info, &framebuffer); + +if (err) +return err; + + efifb.fb_width = mode_info.width; + efifb.fb_height = mode_info.height; + efifb.fb_stride = mode_info.stride; + + efifb.fb_addr = (grub_addr_t ) framebuffer; + efifb.fb_size =ALIGN_UP (mode_info.pitch * efifb.fb_height,65536 ); + + efifb.fb_mask_red = mode_info.red_mask; + efifb.fb_mask_green = mode_info.green_mask; + efifb.fb_mask_blue = mode_info.blue_mask; + efifb.fb_mask_reserved = mode_info.reserved_mask; + + err =grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF , &efifb,sizeof (efifb)); +return err; +} +#endif +static grub_err_t grub_freebsd_boot (void ) {
@@ -687,6 +745,10 @@ grub_freebsd_boot (void) *(grub_uint32_t *) p_tag = bootflags;break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF : +grub_memcpy (p_tag, tag->data, tag->len); +break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_MODINFOMD_ENVP :if (is_64bit) *(grub_uint64_t *) p_tag = bi.environment;
@@ -716,7 +778,10 @@ grub_freebsd_boot (void) bi.kern_end = kern_end; +#ifndef GRUB_MACHINE_EFI +/* Don't set text mode on EFI boot */ grub_video_set_mode ("text" ,0 ,0 ); +#endif if (is_64bit) {
@@ -1560,6 +1625,16 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) FREEBSD_MODINFOMD_KERNEND, &data, len);if (err)return err; + +#ifdef GRUB_MACHINE_EFI + err =grub_freebsd_setup_video (); +if (err) + { +grub_print_error (); +grub_puts_ (N_ ("Booting in EFI blind mode" )); + grub_errno =GRUB_ERR_NONE ; + } +#endif }grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part); freebsd_zfsguid =0 ;
video/efi_gop.c +14 -0
@@ -180,6 +180,8 @@ grub_video_gop_fill_real_mode_info (unsigned mode, out->mode_type =GRUB_VIDEO_MODE_TYPE_RGB ; out->bpp =grub_video_gop_get_bpp (in); out->bytes_per_pixel = out->bpp >>3 ; + out->stride = in->pixels_per_scanline; + out->pixel_format = in->pixel_format;if (!out->bpp)return grub_error (GRUB_ERR_IO ,"unsupported video mode" ); out->pitch = in->pixels_per_scanline * out->bytes_per_pixel;
@@ -195,6 +197,10 @@ grub_video_gop_fill_real_mode_info (unsigned mode, out->blue_field_pos =16 ; out->reserved_mask_size =8 ; out->reserved_field_pos =24 ; + out->red_mask =0x000000ff ; + out->green_mask =0x0000ff00 ; + out->blue_mask =0x00ff0000 ; + out->reserved_mask =0xff000000 ;break ;case GRUB_EFI_GOT_BGRA8 :
@@ -206,6 +212,10 @@ grub_video_gop_fill_real_mode_info (unsigned mode, out->blue_field_pos =0 ; out->reserved_mask_size =8 ; out->reserved_field_pos =24 ; + out->red_mask =0x00ff0000 ; + out->green_mask =0x0000ff00 ; + out->blue_mask =0x000000ff ; + out->reserved_mask =0xff000000 ;break ;case GRUB_EFI_GOT_BITMASK :
@@ -217,6 +227,10 @@ grub_video_gop_fill_real_mode_info (unsigned mode, &out->blue_field_pos);grub_video_gop_get_bitmask (in->pixel_bitmask.a, &out->reserved_mask_size, &out->reserved_field_pos); + out->red_mask = in->pixel_bitmask.r; + out->green_mask = in->pixel_bitmask.g; + out->blue_mask = in->pixel_bitmask.b; + out->reserved_mask = in->pixel_bitmask.a;break ;default :
grub/i386/bsd.h +1 -0
@@ -26,6 +26,7 @@#include <grub/i386/netbsd_reboot.h> #include <grub/i386/openbsd_reboot.h> #include <grub/i386/freebsd_linker.h> +#include <grub/i386/freebsd_bootinfo.h> #include <grub/i386/netbsd_bootinfo.h> #include <grub/i386/openbsd_bootarg.h>
grub/i386/freebsd_bootinfo.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2008,2009 Free Software Foundation, Inc. +* +* GRUB is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* GRUB is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with GRUB. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <grub/types.h> + +#define FREEBSD_BTINFO_FRAMEBUF 0x1005 + +struct grub_freebsd_btinfo_framebuf { +grub_uint64_t fb_addr; +grub_uint64_t fb_size; +grub_int32_t fb_height; +grub_int32_t fb_width; +grub_int32_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; +};
grub/video.h +18 -0
@@ -141,6 +141,12 @@ struct grub_video_mode_info/* Pitch of one scanline. How many bytes there are for scanline. */ unsigned int pitch; +/* Pixels per scanline */ +unsigned int stride; + +/* Native pixel format */ +unsigned int pixel_format; +/* In index color mode, number of colors. In RGB mode this is 256. */ unsigned int number_of_colors;
@@ -156,21 +162,33 @@ struct grub_video_mode_info/* What is location of red color bits. In Index Color mode, this is 0. */ unsigned int red_field_pos; +/* Native red mask */ +unsigned int red_mask; +/* How many bits are reserved for green color. */ unsigned int green_mask_size;/* What is location of green color bits. In Index Color mode, this is 0. */ unsigned int green_field_pos; +/* Native green mask */ +unsigned int green_mask; +/* How many bits are reserved for blue color. */ unsigned int blue_mask_size;/* What is location of blue color bits. In Index Color mode, this is 0. */ unsigned int blue_field_pos; +/* Native blue mask */ +unsigned int blue_mask; +/* How many bits are reserved in color. */ unsigned int reserved_mask_size; +/* Native reserved mask */ +unsigned int reserved_mask; +/* What is location of reserved color bits. In Index Color mode, this is 0. */ unsigned int reserved_field_pos;
Signature · 12 lines
2.1.2 From 68a48b4a3597b67110ad3c7fcc05f6f0e1e40b05 Mon Sep 17 00:00:00 2001 From: Kris Moore <[email protected]> Date: Tue, 28 Oct 2014 16:21:51 -0400 Subject: [PATCH 2/2] Update changelog with details about the FreeBSD EFI framebuffer passthrough --- ChangeLog | 9 +++++++++ 1 file changed, 9 insertions(+)
ChangeLog +9 -0
@@ -1,3 +1,12 @@ +2014-10-28 Kris Moore <[email protected]> + * grub-core/loader/i386/bsd.c: Add default FreeBSD EFI video mode, and + structure to pass information into EFI booted kernel + * grub-core/video/efi_gop.c: Expose some additional GOP mode information + * include/grub/i386/bsd.h: Include new freebsd_bootinfo.h + * include/grub/i386/freebsd_bootinfo.h: Add grub_freebsd_btinfo_framebuf + structure for FreeBSD EFI framebuffer passthrough + * include/grub/video.h: Add the additional exposed GOP values + 2014-10-14 Andrei Borzenkov <[email protected]> * grub-core/loader/arm/linux.c: Use full initializer for initrd_ctx to
Signature · 1 line
2.1.2
Quoted 8 lines · Kris Moore
Got another patch for review today.
This patch adds support for FreeBSD's new VT console driver when booting in EFI mode on FreeBSD 10.1 and later.
Please let me know any comments, or things that need addressed to get this merged in.
Quoted 8 lines
Thanks!
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
An updated version of this patch is now in the FreeBSD ports tree:
This updated version adds some ACPI detection / hints that the FreeBSD kernel requires to UEFI boot on most systems.
Thanks!
Signature · 3 lines
Kris Moore PC-BSD Software iXsystems
Quoted 151 lines · Kris Moore
Got another patch for review today.
This patch adds support for FreeBSD's new VT console driver when booting in EFI mode on FreeBSD 10.1 and later.
Please let me know any comments, or things that need addressed to get this merged in.
Thanks!
-- Kris Moore PC-BSD Software iXsystems
patch-grub-fb
From
a9c20c1640cdea0ba902095cb18760f5ebe98875Mon Sep 17 00:00:00 2001
From: Kris Moore <[email protected]>
Date: Tue, 28 Oct 2014 15:59:59 -0400
Subject: [PATCH 1/2] Add support for passing EFI framebuffer information to
FreeBSD kernel on FreeBSD 10.1 and later.--- grub-core/loader/i386/bsd.c | 75 ++++++++++++++++++++++++++++++++++++ grub-core/video/efi_gop.c | 14 +++++++ include/grub/i386/bsd.h | 1 + include/grub/i386/freebsd_bootinfo.h | 33 ++++++++++++++++ include/grub/video.h | 18 +++++++++ 5 files changed, 141 insertions(+) create mode 100644 include/grub/i386/freebsd_bootinfo.hloader/i386/bsd.c +75
-0@@ -48,6 +48,7 @@ GRUB_MOD_LICENSE ("GPLv3+");#ifdef GRUB_MACHINE_EFI #include <grub/efi/efi.h> #define NETBSD_DEFAULT_VIDEO_MODE "800x600" +#define FREEBSD_DEFAULT_VIDEO_MODE "800x600"#else #define NETBSD_DEFAULT_VIDEO_MODE "text"#include <grub/i386/pc/vbe.h> @@ -584,6 +585,63 @@ freebsd_get_zfs (void)grub_free (uuid); } +#ifdef GRUB_MACHINE_EFI + +static grub_err_t +grub_freebsd_setup_video (void ) +{ +struct grub_video_mode_info mode_info; +void *framebuffer; +const char *modevar; +struct grub_freebsd_btinfo_framebuf efifb; +grub_err_t err; +grub_video_driver_id_t driv_id; + + modevar =grub_env_get ("gfxpayload" ); + +/* Now all graphical modes are acceptable. +May change in future if we have modes without framebuffer. */ +if (modevar && *modevar !=0 ) + { +char *tmp; + tmp =grub_xasprintf ("%s;" FREEBSD_DEFAULT_VIDEO_MODE , modevar); +if (! tmp) +return grub_errno; + err =grub_video_set_mode (tmp,0 ,0 ); +grub_free (tmp); + } +else + err =grub_video_set_mode (FREEBSD_DEFAULT_VIDEO_MODE ,0 ,0 ); + +if (err) +return err; + + driv_id =grub_video_get_driver_id (); +if (driv_id ==GRUB_VIDEO_DRIVER_NONE ) +return GRUB_ERR_NONE ; + + err =grub_video_get_info_and_fini (&mode_info, &framebuffer); + +if (err) +return err; + + efifb.fb_width = mode_info.width; + efifb.fb_height = mode_info.height; + efifb.fb_stride = mode_info.stride; + + efifb.fb_addr = (grub_addr_t ) framebuffer; + efifb.fb_size =ALIGN_UP (mode_info.pitch * efifb.fb_height,65536 ); + + efifb.fb_mask_red = mode_info.red_mask; + efifb.fb_mask_green = mode_info.green_mask; + efifb.fb_mask_blue = mode_info.blue_mask; + efifb.fb_mask_reserved = mode_info.reserved_mask; + + err =grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF , &efifb,sizeof (efifb)); +return err; +} +#endif +static grub_err_t grub_freebsd_boot (void ) {@@ -687,6 +745,10 @@ grub_freebsd_boot (void) *(grub_uint32_t *) p_tag = bootflags;break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF : +grub_memcpy (p_tag, tag->data, tag->len); +break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_MODINFOMD_ENVP :if (is_64bit) *(grub_uint64_t *) p_tag = bi.environment;@@ -716,7 +778,10 @@ grub_freebsd_boot (void) bi.kern_end = kern_end; +#ifndef GRUB_MACHINE_EFI +/* Don't set text mode on EFI boot */ grub_video_set_mode ("text" ,0 ,0 ); +#endif if (is_64bit) {@@ -1560,6 +1625,16 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) FREEBSD_MODINFOMD_KERNEND, &data, len);if (err)return err; + +#ifdef GRUB_MACHINE_EFI + err =grub_freebsd_setup_video (); +if (err) + { +grub_print_error (); +grub_puts_ (N_ ("Booting in EFI blind mode" )); + grub_errno =GRUB_ERR_NONE ; + } +#endif }grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part); freebsd_zfsguid =0 ;video/efi_gop.c +0
-0
video/efi_gop.c grub_video_gop_fill_real_mode_info (unsigned mode, · line 184
Quoted 5 lines
video/efi_gop.c +2
-0@@ -180,6 +180,8 @@ grub_video_gop_fill_real_mode_info (unsigned mode, out->mode_type =GRUB_VIDEO_MODE_TYPE_RGB ; out->bpp =grub_video_gop_get_bpp (in); out->bytes_per_pixel = out->bpp >>3 ; + out->stride = in->pixels_per_scanline; + out->pixel_format = in->pixel_format;
Please, don't add redundant fields to structs. All this info can be inferred from available fields in FreeBSD code. As a bonus it will work with other gfx drivers.
Another point: is this driver usable on non-EFI? It's of particular interest on coreboot where changing video mode currently requires reflash.
Quoted 165 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 151 lines · Kris Moore
Got another patch for review today.
This patch adds support for FreeBSD's new VT console driver when booting in EFI mode on FreeBSD 10.1 and later.
Please let me know any comments, or things that need addressed to get this merged in.
Thanks!
-- Kris Moore PC-BSD Software iXsystems
patch-grub-fb
From
a9c20c1640cdea0ba902095cb18760f5ebe98875Mon Sep 17 00:00:00 2001
From: Kris Moore <[email protected]>
Date: Tue, 28 Oct 2014 15:59:59 -0400
Subject: [PATCH 1/2] Add support for passing EFI framebuffer information to
FreeBSD kernel on FreeBSD 10.1 and later.--- grub-core/loader/i386/bsd.c | 75 ++++++++++++++++++++++++++++++++++++ grub-core/video/efi_gop.c | 14 +++++++ include/grub/i386/bsd.h | 1 + include/grub/i386/freebsd_bootinfo.h | 33 ++++++++++++++++ include/grub/video.h | 18 +++++++++ 5 files changed, 141 insertions(+) create mode 100644 include/grub/i386/freebsd_bootinfo.hloader/i386/bsd.c +75
-0@@ -48,6 +48,7 @@ GRUB_MOD_LICENSE ("GPLv3+");#ifdef GRUB_MACHINE_EFI #include <grub/efi/efi.h> #define NETBSD_DEFAULT_VIDEO_MODE "800x600" +#define FREEBSD_DEFAULT_VIDEO_MODE "800x600"#else #define NETBSD_DEFAULT_VIDEO_MODE "text"#include <grub/i386/pc/vbe.h> @@ -584,6 +585,63 @@ freebsd_get_zfs (void)grub_free (uuid); } +#ifdef GRUB_MACHINE_EFI + +static grub_err_t +grub_freebsd_setup_video (void ) +{ +struct grub_video_mode_info mode_info; +void *framebuffer; +const char *modevar; +struct grub_freebsd_btinfo_framebuf efifb; +grub_err_t err; +grub_video_driver_id_t driv_id; + + modevar =grub_env_get ("gfxpayload" ); + +/* Now all graphical modes are acceptable. +May change in future if we have modes without framebuffer. */ +if (modevar && *modevar !=0 ) + { +char *tmp; + tmp =grub_xasprintf ("%s;" FREEBSD_DEFAULT_VIDEO_MODE , modevar); +if (! tmp) +return grub_errno; + err =grub_video_set_mode (tmp,0 ,0 ); +grub_free (tmp); + } +else + err =grub_video_set_mode (FREEBSD_DEFAULT_VIDEO_MODE ,0 ,0 ); + +if (err) +return err; + + driv_id =grub_video_get_driver_id (); +if (driv_id ==GRUB_VIDEO_DRIVER_NONE ) +return GRUB_ERR_NONE ; + + err =grub_video_get_info_and_fini (&mode_info, &framebuffer); + +if (err) +return err; + + efifb.fb_width = mode_info.width; + efifb.fb_height = mode_info.height; + efifb.fb_stride = mode_info.stride; + + efifb.fb_addr = (grub_addr_t ) framebuffer; + efifb.fb_size =ALIGN_UP (mode_info.pitch * efifb.fb_height,65536 ); + + efifb.fb_mask_red = mode_info.red_mask; + efifb.fb_mask_green = mode_info.green_mask; + efifb.fb_mask_blue = mode_info.blue_mask; + efifb.fb_mask_reserved = mode_info.reserved_mask; + + err =grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF , &efifb,sizeof (efifb)); +return err; +} +#endif +static grub_err_t grub_freebsd_boot (void ) {@@ -687,6 +745,10 @@ grub_freebsd_boot (void) *(grub_uint32_t *) p_tag = bootflags;break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF : +grub_memcpy (p_tag, tag->data, tag->len); +break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_MODINFOMD_ENVP :if (is_64bit) *(grub_uint64_t *) p_tag = bi.environment;@@ -716,7 +778,10 @@ grub_freebsd_boot (void) bi.kern_end = kern_end; +#ifndef GRUB_MACHINE_EFI +/* Don't set text mode on EFI boot */ grub_video_set_mode ("text" ,0 ,0 ); +#endif if (is_64bit) {@@ -1560,6 +1625,16 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) FREEBSD_MODINFOMD_KERNEND, &data, len);if (err)return err; + +#ifdef GRUB_MACHINE_EFI + err =grub_freebsd_setup_video (); +if (err) + { +grub_print_error (); +grub_puts_ (N_ ("Booting in EFI blind mode" )); + grub_errno =GRUB_ERR_NONE ; + } +#endif }grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part); freebsd_zfsguid =0 ;video/efi_gop.c +0
-0video/efi_gop.c grub_video_gop_fill_real_mode_info (unsigned mode, · line 184
Quoted 5 lines
video/efi_gop.c +2
-0@@ -180,6 +180,8 @@ grub_video_gop_fill_real_mode_info (unsigned mode, out->mode_type =GRUB_VIDEO_MODE_TYPE_RGB ; out->bpp =grub_video_gop_get_bpp (in); out->bytes_per_pixel = out->bpp >>3 ; + out->stride = in->pixels_per_scanline; + out->pixel_format = in->pixel_format;Please, don't add redundant fields to structs. All this info can be inferred from available fields in FreeBSD code. As a bonus it will work with other gfx drivers.
Another point: is this driver usable on non-EFI? It's of particular interest on coreboot where changing video mode currently requires reflash.
Quoted 4 lines
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Attached is a cleaned up version of the patch which doesn't add to any existing structs now. Let me know if this is closer to what you had in mind.
I don't think this driver is usable on non-EFI FreeBSD yet. They have a new VT console driver, but I'm not sure their loader does video mode passthrough outside of EFI. I'm sure it will in the future, probably sometime in 11.X.
Signature · 3 lines
Kris Moore PC-BSD Software iXsystems
From 997363ec7698f34d74769960c4e76cf8b369052e Mon Sep 17 00:00:00 2001
From: Kris Moore <[email protected]>
Date: Tue, 30 Dec 2014 14:34:58 -0500
Subject: [PATCH] Add the patch for FreeBSD UEFI booting / framebuffer
passthrough, add fixes to ACPI environment variables while here
--- ChangeLog | 9 +++ grub-core/loader/i386/bsd.c | 134 +++++++++++++++++++++++++++++++++++ include/grub/i386/bsd.h | 1 + include/grub/i386/freebsd_bootinfo.h | 33 +++++++++ 4 files changed, 177 insertions(+) create mode 100644 include/grub/i386/freebsd_bootinfo.h
ChangeLog +9 -0
@@ -1,3 +1,12 @@ +2014-12-30 Kris Moore <[email protected]> + * grub-core/loader/i386/bsd.c: Set FreeBSD specific ACPI hints when booting + in EFI mode + * grub-core/loader/i386/bsd.c: Add default FreeBSD EFI video mode, and + structure to pass information into EFI booted kernel + * include/grub/i386/bsd.h: Include new freebsd_bootinfo.h + * include/grub/i386/freebsd_bootinfo.h: Add grub_freebsd_btinfo_framebuf + structure for FreeBSD EFI framebuffer passthrough + 2014-12-09 Andrei Borzenkov <[email protected]> * grub-core/term/serial.c (grub_cmd_serial): Fix --rtscts
loader/i386/bsd.c +134 -0
177 lines not on this page · raw message
grub/i386/bsd.h +1 -0
@@ -26,6 +26,7 @@#include <grub/i386/netbsd_reboot.h> #include <grub/i386/openbsd_reboot.h> #include <grub/i386/freebsd_linker.h> +#include <grub/i386/freebsd_bootinfo.h> #include <grub/i386/netbsd_bootinfo.h> #include <grub/i386/openbsd_bootarg.h>
grub/i386/freebsd_bootinfo.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2008,2009 Free Software Foundation, Inc. +* +* GRUB is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* GRUB is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with GRUB. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <grub/types.h> + +#define FREEBSD_BTINFO_FRAMEBUF 0x1005 + +struct grub_freebsd_btinfo_framebuf { +grub_uint64_t fb_addr; +grub_uint64_t fb_size; +grub_int32_t fb_height; +grub_int32_t fb_width; +grub_int32_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; +};
Signature · 1 line
2.2.1
Quoted 13 lines · Kris Moore
Quoted 12 lines · Kris Moore
Got another patch for review today.
This patch adds support for FreeBSD's new VT console driver when booting in EFI mode on FreeBSD 10.1 and later.
Please let me know any comments, or things that need addressed to get this merged in.
Thanks!
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-develAn updated version of this patch is now in the FreeBSD ports tree:
Sorry, we cannot accept patches if they're not sent to this ML.
Quoted 17 lines
This updated version adds some ACPI detection / hints that the FreeBSD kernel requires to UEFI boot on most systems.
Thanks!
Signature · 10 lines
Kris Moore PC-BSD Software iXsystems _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 70 lines
Attached is a cleaned up version of the patch which doesn't add to any existing structs now. Let me know if this is closer to what you had in mind.
I don't think this driver is usable on non-EFI FreeBSD yet. They have a new VT console driver, but I'm not sure their loader does video mode passthrough outside of EFI. I'm sure it will in the future, probably sometime in 11.X.
Signature · 21 lines
Kris Moore PC-BSD Software iXsystems patch-grub-efi-framebuffer From 997363ec7698f34d74769960c4e76cf8b369052e Mon Sep 17 00:00:00 2001 From: Kris Moore <[email protected]> Date: Tue, 30 Dec 2014 14:34:58 -0500 Subject: [PATCH] Add the patch for FreeBSD UEFI booting / framebuffer passthrough, add fixes to ACPI environment variables while here --- ChangeLog | 9 +++ grub-core/loader/i386/bsd.c | 134 +++++++++++++++++++++++++++++++++++ include/grub/i386/bsd.h | 1 + include/grub/i386/freebsd_bootinfo.h | 33 +++++++++ 4 files changed, 177 insertions(+) create mode 100644 include/grub/i386/freebsd_bootinfo.hChangeLog +9
-0@@ -1,3 +1,12 @@ +2014-12-30 Kris Moore <[email protected]> + * grub-core/loader/i386/bsd.c: Set FreeBSD specific ACPI hints when booting + in EFI mode + * grub-core/loader/i386/bsd.c: Add default FreeBSD EFI video mode, and + structure to pass information into EFI booted kernel + * include/grub/i386/bsd.h: Include new freebsd_bootinfo.h + * include/grub/i386/freebsd_bootinfo.h: Add grub_freebsd_btinfo_framebuf + structure for FreeBSD EFI framebuffer passthrough + 2014-12-09 Andrei Borzenkov <[email protected]> * grub-core/term/serial.c (grub_cmd_serial): Fix --rtsctsloader/i386/bsd.c +2
-0@@ -42,12 +42,14 @@GRUB_MOD_LICENSE ("GPLv3+" );#include <grub/video.h> +#include <grub/acpi.h> #ifdef GRUB_MACHINE_PCBIOS #include <grub/machine/biosnum.h> #endif #ifdef GRUB_MACHINE_EFI #include <grub/efi/efi.h> #define NETBSD_DEFAULT_VIDEO_MODE "800x600" +#define FREEBSD_DEFAULT_VIDEO_MODE "800x600"#else #define NETBSD_DEFAULT_VIDEO_MODE "text"#include <grub/i386/pc/vbe.h>
loader/i386/bsd.c freebsd_get_zfs (void) · line 590
Quoted 5 lines
loader/i386/bsd.c +2
-0@@ -584,6 +586,72 @@ freebsd_get_zfs (void)grub_free (uuid); } +#ifdef GRUB_MACHINE_EFI +
This shouldn't be limited to EFI. Just EFI would use GFX default while BIOS would use text.
Quoted 32 lines
loader/i386/bsd.c +32
-0+static grub_err_t +grub_freebsd_setup_video (void ) +{ +struct grub_video_mode_info mode_info; +void *framebuffer; +const char *modevar; +struct grub_freebsd_btinfo_framebuf efifb; +grub_err_t err; +grub_video_driver_id_t driv_id; + + modevar =grub_env_get ("gfxpayload" ); + +/* Now all graphical modes are acceptable. +May change in future if we have modes without framebuffer. */ +if (modevar && *modevar !=0 ) + { +char *tmp; + tmp =grub_xasprintf ("%s;" FREEBSD_DEFAULT_VIDEO_MODE , modevar); +if (! tmp) +return grub_errno; + err =grub_video_set_mode (tmp,0 ,0 ); +grub_free (tmp); + } +else + err =grub_video_set_mode (FREEBSD_DEFAULT_VIDEO_MODE ,0 ,0 ); + +if (err) +return err; + + driv_id =grub_video_get_driver_id (); +if (driv_id ==GRUB_VIDEO_DRIVER_NONE ) +return GRUB_ERR_NONE ;
loader/i386/bsd.c freebsd_get_zfs (void) · line 632
Quoted 10 lines
loader/i386/bsd.c +10
-0+ + err =grub_video_get_info_and_fini (&mode_info, &framebuffer); + +if (err) +return err; + + efifb.fb_width = mode_info.width; + efifb.fb_height = mode_info.height; + efifb.fb_stride = mode_info.pitch / mode_info.bytes_per_pixel; +
Is bytes_per_pixel checked against 0 somewhere?
Quoted 7 lines
loader/i386/bsd.c +7
-0+ efifb.fb_addr = (grub_addr_t ) framebuffer; + efifb.fb_size =ALIGN_UP (mode_info.pitch * efifb.fb_height,65536 ); + +if ( mode_info.blue_field_pos ==16 ) { + efifb.fb_mask_red =0x000000ff ; + efifb.fb_mask_green =0x0000ff00 ; + efifb.fb_mask_blue =0x00ff0000 ;
loader/i386/bsd.c freebsd_get_zfs (void) · line 649
Quoted 10 lines
loader/i386/bsd.c +10
-0+ } + +if ( mode_info.blue_field_pos ==0 ) { + efifb.fb_mask_red =0x00ff0000 ; + efifb.fb_mask_green =0x0000ff00 ; + efifb.fb_mask_blue =0x000000ff ; + } + + efifb.fb_mask_reserved =0xff000000 ; +
Why these conditions? Why not use universal function? efifb.fb_mask_red = ((1 << mode_info.red_size) - 1) << mode_info.red_field_pos
and so on
Quoted 48 lines
loader/i386/bsd.c +41
-0+ err =grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF , &efifb,sizeof (efifb)); + return err; +} +#endif +static grub_err_t grub_freebsd_boot (void ) {@@ -602,6 +670,55 @@ grub_freebsd_boot (void) bi.boot_device = freebsd_biosdev; +#ifdef GRUB_MACHINE_EFI +/* When booting in EFI mode, we need to export some additional kernel ACPI hints */ +struct grub_acpi_rsdp_v10 *v1; +struct grub_acpi_rsdp_v20 *v2; + v1 =grub_acpi_get_rsdpv1 (); + v2 =grub_acpi_get_rsdpv2 (); +if (v2 && v2->length >40 ) + v2 =0 ; + +int revision; +char acpiBuf[24 ]; + +if (v1) + { + revision = v1->revision; +if ( revision ==0 ) + revision =1 ; +grub_snprintf (acpiBuf,sizeof (acpiBuf),"%d" , revision); +grub_env_set ("kFreeBSD.hint.acpi.0.revision" , acpiBuf); + +grub_snprintf (acpiBuf,sizeof (acpiBuf),"%s" , v1->oemid); +grub_env_set ("kFreeBSD.hint.acpi.0.oem" , acpiBuf); + +grub_snprintf (acpiBuf,sizeof (acpiBuf),"0x%016x" , v1->rsdt_addr); +grub_env_set ("kFreeBSD.hint.acpi.0.rsdt" , acpiBuf); + +grub_snprintf (acpiBuf,sizeof (acpiBuf),"0x%016llx" , (unsigned long long )v1); +grub_env_set ("kFreeBSD.hint.acpi.0.rsdp" , acpiBuf); + } + +if (v2) + { + revision = v2->rsdpv1.revision; +if ( revision ==0 ) + revision =1 ; +
loader/i386/bsd.c grub_freebsd_boot (void) · line 718
Quoted 10 lines
loader/i386/bsd.c +10
-0+grub_snprintf (acpiBuf,sizeof (acpiBuf),"%d" , revision); +grub_env_set ("kFreeBSD.hint.acpi.0.revision" , acpiBuf); + +grub_snprintf (acpiBuf,sizeof (acpiBuf),"0x%016llx" , (unsigned long long )v2->xsdt_addr); +grub_env_set ("kFreeBSD.hint.acpi.0.xsdt" , acpiBuf); + +grub_snprintf (acpiBuf,sizeof (acpiBuf),"%d" , v2->length); +grub_env_set ("kFreeBSD.hint.acpi.0.xsdt_length" , acpiBuf); + } +
This has to be a separate commit
Quoted 75 lines
loader/i386/bsd.c +20
-0+ +#endif + p_size =0 ; FOR_SORTED_ENV (var) if ((grub_memcmp (var->name, "kFreeBSD.", sizeof("kFreeBSD.") - 1) == 0) && (var->name[sizeof("kFreeBSD.") - 1]))@@ -687,6 +804,10 @@ grub_freebsd_boot (void) *(grub_uint32_t *) p_tag = bootflags;break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_BTINFO_FRAMEBUF : +grub_memcpy (p_tag, tag->data, tag->len); +break ; +case FREEBSD_MODINFO_METADATA |FREEBSD_MODINFOMD_ENVP :if (is_64bit) *(grub_uint64_t *) p_tag = bi.environment;@@ -716,7 +837,10 @@ grub_freebsd_boot (void) bi.kern_end = kern_end; +#ifndef GRUB_MACHINE_EFI +/* Don't set text mode on EFI boot */ grub_video_set_mode ("text" ,0 ,0 ); +#endif if (is_64bit) {@@ -1560,6 +1684,16 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) FREEBSD_MODINFOMD_KERNEND, &data, len);if (err)return err; + +#ifdef GRUB_MACHINE_EFI + err =grub_freebsd_setup_video (); +if (err) + { +grub_print_error (); +grub_puts_ (N_ ("Booting in EFI blind mode" )); + grub_errno =GRUB_ERR_NONE ; + } +#endif }grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part); freebsd_zfsguid =0 ;grub/i386/freebsd_bootinfo.h new file +23
-0@@ -0,0 +1,33 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2008,2009 Free Software Foundation, Inc. +* +* GRUB is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* GRUB is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with GRUB. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <grub/types.h> + +#define FREEBSD_BTINFO_FRAMEBUF 0x1005 + +struct grub_freebsd_btinfo_framebuf {
grub/i386/freebsd_bootinfo.h line 33
Quoted 10 lines
grub/i386/freebsd_bootinfo.h new file +10
-0+grub_uint64_t fb_addr; +grub_uint64_t fb_size; +grub_int32_t fb_height; +grub_int32_t fb_width; +grub_int32_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; +};
This file looks copied. Please provide correct attribution.
Quoted 9 lines
-- 2.2.1
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel