Print this page
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
loader: pxe receive cleanup
9475 libefi: Do not return only if ReceiveFilter
installboot: should support efi system partition
8931 boot1.efi: scan all display modes rather than
loader: spinconsole updates
loader: gfx experiment to try GOP Blt() function.
sha1 build test
loader: add sha1 hash calculation
common/sha1: update for loader build
loader: biosdisk rework
uts: 32-bit kernel FB needs mapping in low memory
uts: add diag-device
uts: boot console mirror with diag-device
uts: enable very early console on ttya
kmdb: add diag-device as input/output device
uts: test VGA memory exclusion from mapping
uts: clear boot mapping and protect boot pages test
uts: add dboot map debug printf
uts: need to release FB pages in release_bootstrap()
uts: add screenmap ioctl
uts: update sys/queue.h
loader: add illumos uts/common to include path
loader: tem/gfx font cleanup
loader: vbe checks
uts: gfx_private set KD_TEXT when KD_RESETTEXT is
uts: gfx 8-bit update
loader: gfx 8-bit fix
loader: always set media size from partition.
uts: MB2 support for 32-bit kernel
loader: x86 should have tem 80x25
uts: x86 should have tem 80x25
uts: font update
loader: font update
uts: tem attributes
loader: tem.c comment added
uts: use font module
loader: add font module
loader: build rules for new font setup
uts: gfx_private update for new font structure
uts: early boot update for new font structure
uts: font update
uts: font build rules update for new fonts
uts: tem update to new font structure
loader: module.c needs to include tem_impl.h
uts: gfx_private 8x16 font rework
uts: make font_lookup public
loader: font rework
uts: font rework
9259 libefi: efi_alloc_and_read should check for PMBR
uts: tem utf-8 support
loader: implement tem utf-8 support
loader: tem should be able to display UTF-8
7784 uts: console input should support utf-8
7796 uts: ldterm default to utf-8
uts: do not reset serial console
uts: set up colors even if tem is not console
uts: add type for early boot properties
uts: gfx_private experiment with drm and vga
uts: gfx_private should use setmode drm callback.
uts: identify FB types and set up gfx_private based
loader: replace gop and vesa with framebuffer
uts: boot needs simple tem to support mdb
uts: boot_keyboard should emit esc sequences for
uts: gfx_private FB showuld be written by line
kmdb: set terminal window size
uts: gfx_private needs to keep track of early boot FB
pnglite: move pnglite to usr/src/common
loader: gfx_fb
ficl-sys: add gfx primitives
loader: add illumos.png logo
ficl: add fb-putimage
loader: add png support
loader: add alpha blending for gfx_fb
loader: use term-drawrect for menu frame
ficl: add simple gfx words
uts: provide fb_info via fbgattr dev_specific array.
uts: gfx_private add alpha blending
uts: update sys/ascii.h
uts: tem OSC support (incomplete)
uts: implement env module support and use data from
uts: tem get colors from early boot data
loader: use crc32 from libstand (libz)
loader: optimize for size
loader: pass tem info to the environment
loader: import tem for loader console
loader: UEFI loader needs to set ISADIR based on
loader: need UEFI32 support
8918 loader.efi: add vesa edid support
uts: tem_safe_pix_clear_prom_output() should only
uts: tem_safe_pix_clear_entire_screen() should use
uts: tem_safe_check_first_time() should query cursor
uts: tem implement cls callback & visual_io v4
uts: gfx_vgatext use block cursor for vgatext
uts: gfx_private implement cls callback & visual_io
uts: gfx_private bitmap framebuffer implementation
uts: early start frame buffer console support
uts: font functions should check the input char
uts: font rendering should support 16/24/32bit depths
uts: use smallest font as fallback default.
uts: update terminal dimensions based on selected
7834 uts: vgatext should use gfx_private
uts: add spacing property to 8859-1.bdf
terminfo: add underline for sun-color
terminfo: sun-color has 16 colors
uts: add font load callback type
loader: do not repeat int13 calls with error 0x20 and
8905 loader: add skein/edonr support
8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Revert "NEX-16819 loader UEFI support"
This reverts commit ec06b9fc617b99234e538bf2e7e4d02a24993e0c.
Reverting due to failures in the zfs-tests and the sharefs-tests
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
loader: pxe receive cleanup
9475 libefi: Do not return only if ReceiveFilter
installboot: should support efi system partition
8931 boot1.efi: scan all display modes rather than
loader: spinconsole updates
loader: gfx experiment to try GOP Blt() function.
sha1 build test
loader: add sha1 hash calculation
common/sha1: update for loader build
loader: biosdisk rework
uts: 32-bit kernel FB needs mapping in low memory
uts: add diag-device
uts: boot console mirror with diag-device
uts: enable very early console on ttya
kmdb: add diag-device as input/output device
uts: test VGA memory exclusion from mapping
uts: clear boot mapping and protect boot pages test
uts: add dboot map debug printf
uts: need to release FB pages in release_bootstrap()
uts: add screenmap ioctl
uts: update sys/queue.h
loader: add illumos uts/common to include path
loader: tem/gfx font cleanup
loader: vbe checks
uts: gfx_private set KD_TEXT when KD_RESETTEXT is
uts: gfx 8-bit update
loader: gfx 8-bit fix
loader: always set media size from partition.
uts: MB2 support for 32-bit kernel
loader: x86 should have tem 80x25
uts: x86 should have tem 80x25
uts: font update
loader: font update
uts: tem attributes
loader: tem.c comment added
uts: use font module
loader: add font module
loader: build rules for new font setup
uts: gfx_private update for new font structure
uts: early boot update for new font structure
uts: font update
uts: font build rules update for new fonts
uts: tem update to new font structure
loader: module.c needs to include tem_impl.h
uts: gfx_private 8x16 font rework
uts: make font_lookup public
loader: font rework
uts: font rework
libefi: efi_alloc_and_read should check for PMBR
uts: tem utf-8 support
loader: implement tem utf-8 support
loader: tem should be able to display UTF-8
7784 uts: console input should support utf-8
7796 uts: ldterm default to utf-8
uts: do not reset serial console
uts: set up colors even if tem is not console
uts: add type for early boot properties
uts: gfx_private experiment with drm and vga
uts: gfx_private should use setmode drm callback.
uts: identify FB types and set up gfx_private based
loader: replace gop and vesa with framebuffer
uts: boot needs simple tem to support mdb
uts: boot_keyboard should emit esc sequences for
uts: gfx_private FB showuld be written by line
kmdb: set terminal window size
uts: gfx_private needs to keep track of early boot FB
pnglite: move pnglite to usr/src/common
loader: gfx_fb
ficl-sys: add gfx primitives
loader: add illumos.png logo
ficl: add fb-putimage
loader: add png support
loader: add alpha blending for gfx_fb
loader: use term-drawrect for menu frame
ficl: add simple gfx words
uts: provide fb_info via fbgattr dev_specific array.
uts: gfx_private add alpha blending
uts: update sys/ascii.h
uts: tem OSC support (incomplete)
uts: implement env module support and use data from
uts: tem get colors from early boot data
loader: use crc32 from libstand (libz)
loader: optimize for size
loader: pass tem info to the environment
loader: import tem for loader console
loader: UEFI loader needs to set ISADIR based on
loader: need UEFI32 support
8918 loader.efi: add vesa edid support
uts: tem_safe_pix_clear_prom_output() should only
uts: tem_safe_pix_clear_entire_screen() should use
uts: tem_safe_check_first_time() should query cursor
uts: tem implement cls callback & visual_io v4
uts: gfx_vgatext use block cursor for vgatext
uts: gfx_private implement cls callback & visual_io
uts: gfx_private bitmap framebuffer implementation
uts: early start frame buffer console support
uts: font functions should check the input char
uts: font rendering should support 16/24/32bit depths
uts: use smallest font as fallback default.
uts: update terminal dimensions based on selected
7834 uts: vgatext should use gfx_private
uts: add spacing property to 8859-1.bdf
terminfo: add underline for sun-color
terminfo: sun-color has 16 colors
uts: add font load callback type
loader: do not repeat int13 calls with error 0x20 and
8905 loader: add skein/edonr support
8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
*** 66,75 ****
--- 66,76 ----
#endif
#include <sys/mach_intr.h>
#include <vm/hat_i86.h>
#include <sys/x86_archext.h>
#include <sys/avl.h>
+ #include <sys/font.h>
/*
* DDI Boot Configuration
*/
*** 1839,1849 ****
get_boot_properties(void)
{
extern char hw_provider[];
dev_info_t *devi;
char *name;
! int length;
char property_name[50], property_val[50];
void *bop_staging_area;
bop_staging_area = kmem_zalloc(MMU_PAGESIZE, KM_NOSLEEP);
--- 1840,1850 ----
get_boot_properties(void)
{
extern char hw_provider[];
dev_info_t *devi;
char *name;
! int length, flags;
char property_name[50], property_val[50];
void *bop_staging_area;
bop_staging_area = kmem_zalloc(MMU_PAGESIZE, KM_NOSLEEP);
*** 1870,1888 ****
strcmp(property_name, "display-edif-id") == 0) {
continue;
}
length = BOP_GETPROPLEN(bootops, property_name);
! if (length == 0)
continue;
if (length > MMU_PAGESIZE) {
cmn_err(CE_NOTE,
"boot property %s longer than 0x%x, ignored\n",
property_name, MMU_PAGESIZE);
continue;
}
BOP_GETPROP(bootops, property_name, bop_staging_area);
/*
* special properties:
* si-machine, si-hw-provider
* goes to kernel data structures.
--- 1871,1890 ----
strcmp(property_name, "display-edif-id") == 0) {
continue;
}
length = BOP_GETPROPLEN(bootops, property_name);
! if (length < 0)
continue;
if (length > MMU_PAGESIZE) {
cmn_err(CE_NOTE,
"boot property %s longer than 0x%x, ignored\n",
property_name, MMU_PAGESIZE);
continue;
}
BOP_GETPROP(bootops, property_name, bop_staging_area);
+ flags = do_bsys_getproptype(bootops, property_name);
/*
* special properties:
* si-machine, si-hw-provider
* goes to kernel data structures.
*** 1893,1950 ****
* this can be taken out.
*/
if (strcmp(name, "si-machine") == 0) {
(void) strncpy(utsname.machine, bop_staging_area,
SYS_NMLN);
! utsname.machine[SYS_NMLN - 1] = (char)NULL;
! } else if (strcmp(name, "si-hw-provider") == 0) {
(void) strncpy(hw_provider, bop_staging_area, SYS_NMLN);
! hw_provider[SYS_NMLN - 1] = (char)NULL;
! } else if (strcmp(name, "bios-boot-device") == 0) {
copy_boot_str(bop_staging_area, property_val, 50);
(void) ndi_prop_update_string(DDI_DEV_T_NONE, devi,
property_name, property_val);
! } else if (strcmp(name, "acpi-root-tab") == 0) {
! (void) ndi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
! } else if (strcmp(name, "smbios-address") == 0) {
! (void) ndi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
! } else if (strcmp(name, "efi-systab") == 0) {
! (void) ndi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
! } else if (strcmp(name, "efi-systype") == 0) {
! copy_boot_str(bop_staging_area, property_val, 50);
! (void) ndi_prop_update_string(DDI_DEV_T_NONE, devi,
! property_name, property_val);
! } else if (strcmp(name, "stdout") == 0) {
(void) ndi_prop_update_int(DDI_DEV_T_NONE, devi,
property_name, *((int *)bop_staging_area));
! } else if (strcmp(name, "boot-args") == 0) {
! copy_boot_str(bop_staging_area, property_val, 50);
(void) e_ddi_prop_update_string(DDI_DEV_T_NONE, devi,
! property_name, property_val);
! } else if (strcmp(name, "bootargs") == 0) {
! copy_boot_str(bop_staging_area, property_val, 50);
! (void) e_ddi_prop_update_string(DDI_DEV_T_NONE, devi,
! property_name, property_val);
! } else if (strcmp(name, "bootp-response") == 0) {
(void) e_ddi_prop_update_byte_array(DDI_DEV_T_NONE,
devi, property_name, bop_staging_area, length);
! } else if (strcmp(name, "ramdisk_start") == 0) {
! (void) e_ddi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
! } else if (strcmp(name, "ramdisk_end") == 0) {
! (void) e_ddi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
! } else if (strncmp(name, "module-addr-", 12) == 0) {
! (void) e_ddi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
! } else if (strncmp(name, "module-size-", 12) == 0) {
! (void) e_ddi_prop_update_int64(DDI_DEV_T_NONE, devi,
! property_name, *((int64_t *)bop_staging_area));
} else {
/* Property type unknown, use old prop interface */
(void) e_ddi_prop_create(DDI_DEV_T_NONE, devi,
DDI_PROP_CANSLEEP, property_name, bop_staging_area,
length);
}
--- 1895,1965 ----
* this can be taken out.
*/
if (strcmp(name, "si-machine") == 0) {
(void) strncpy(utsname.machine, bop_staging_area,
SYS_NMLN);
! utsname.machine[SYS_NMLN - 1] = '\0';
! continue;
! }
! if (strcmp(name, "si-hw-provider") == 0) {
(void) strncpy(hw_provider, bop_staging_area, SYS_NMLN);
! hw_provider[SYS_NMLN - 1] = '\0';
! continue;
! }
! if (strcmp(name, "bios-boot-device") == 0) {
copy_boot_str(bop_staging_area, property_val, 50);
(void) ndi_prop_update_string(DDI_DEV_T_NONE, devi,
property_name, property_val);
! continue;
! }
! if (strcmp(name, "stdout") == 0) {
(void) ndi_prop_update_int(DDI_DEV_T_NONE, devi,
property_name, *((int *)bop_staging_area));
! continue;
! }
!
! /* Boolean property */
! if (length == 0) {
! (void) e_ddi_prop_create(DDI_DEV_T_NONE, devi,
! DDI_PROP_CANSLEEP, property_name, NULL, 0);
! continue;
! }
!
! /* Now anything else based on type. */
! switch (flags) {
! case DDI_PROP_TYPE_INT:
! if (length == sizeof (int)) {
! (void) e_ddi_prop_update_int(DDI_DEV_T_NONE,
! devi, property_name,
! *((int *)bop_staging_area));
! } else {
! (void) e_ddi_prop_update_int_array(
! DDI_DEV_T_NONE, devi, property_name,
! bop_staging_area, length / sizeof (int));
! }
! break;
! case DDI_PROP_TYPE_STRING:
(void) e_ddi_prop_update_string(DDI_DEV_T_NONE, devi,
! property_name, bop_staging_area);
! break;
! case DDI_PROP_TYPE_BYTE:
(void) e_ddi_prop_update_byte_array(DDI_DEV_T_NONE,
devi, property_name, bop_staging_area, length);
! break;
! case DDI_PROP_TYPE_INT64:
! if (length == sizeof (uint64_t)) {
! (void) e_ddi_prop_update_int64(DDI_DEV_T_NONE,
! devi, property_name,
! *((uint64_t *)bop_staging_area));
} else {
+ (void) e_ddi_prop_update_int64_array(
+ DDI_DEV_T_NONE, devi, property_name,
+ bop_staging_area,
+ length / sizeof (uint64_t));
+ }
+ break;
+ default:
/* Property type unknown, use old prop interface */
(void) e_ddi_prop_create(DDI_DEV_T_NONE, devi,
DDI_PROP_CANSLEEP, property_name, bop_staging_area,
length);
}
*** 2016,2026 ****
--- 2031,2090 ----
}
kmem_free(bop_staging_area, MMU_PAGESIZE);
}
+ /*
+ * Copy console font to kernel memory. The temporary font setup
+ * to use font module was done in early console setup, using low
+ * memory and data from font module. Now we need to allocate
+ * kernel memory and copy data over, so the low memory can be freed.
+ * We can have at most one entry in font list from early boot.
+ */
+ static void
+ get_console_font(void)
+ {
+ struct fontlist *fp, *fl;
+ bitmap_data_t *bd;
+ struct font *fd, *tmp;
+ int i;
+ if (STAILQ_EMPTY(&fonts))
+ return;
+
+ fl = STAILQ_FIRST(&fonts);
+ STAILQ_REMOVE_HEAD(&fonts, font_next);
+ fp = kmem_zalloc(sizeof (*fp), KM_SLEEP);
+ bd = kmem_zalloc(sizeof (*bd), KM_SLEEP);
+ fd = kmem_zalloc(sizeof (*fd), KM_SLEEP);
+
+ fp->font_name = NULL;
+ fp->font_flags = FONT_BOOT;
+ fp->font_data = bd;
+
+ bd->width = fl->font_data->width;
+ bd->height = fl->font_data->height;
+ bd->uncompressed_size = fl->font_data->uncompressed_size;
+ bd->font = fd;
+
+ tmp = fl->font_data->font;
+ fd->vf_width = tmp->vf_width;
+ fd->vf_height = tmp->vf_height;
+ for (i = 0; i < VFNT_MAPS; i++) {
+ if (tmp->vf_map_count[i] == 0)
+ continue;
+ fd->vf_map_count[i] = tmp->vf_map_count[i];
+ fd->vf_map[i] = kmem_alloc(fd->vf_map_count[i] *
+ sizeof (*fd->vf_map[i]), KM_SLEEP);
+ bcopy(tmp->vf_map[i], fd->vf_map[i], fd->vf_map_count[i] *
+ sizeof (*fd->vf_map[i]));
+ }
+ fd->vf_bytes = kmem_alloc(bd->uncompressed_size, KM_SLEEP);
+ bcopy(tmp->vf_bytes, fd->vf_bytes, bd->uncompressed_size);
+ STAILQ_INSERT_HEAD(&fonts, fp, font_next);
+ }
+
/*
* This is temporary, but absolutely necessary. If we are being
* booted with a device tree created by the DevConf project's bootconf
* program, then we have device information nodes that reflect
* reality. At this point in time in the Solaris release schedule, the
*** 2568,2577 ****
--- 2632,2644 ----
get_boot_properties();
/* not framebuffer should be enumerated, if present */
get_vga_properties();
+ /* Copy console font if provided by boot. */
+ get_console_font();
+
/*
* Check for administratively disabled drivers.
*/
check_driver_disable();