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>
*** 22,50 ****
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
- #pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Miniature VGA driver for bootstrap.
*/
#include <sys/archsystm.h>
#include <sys/vgareg.h>
#include "boot_vga.h"
#if defined(_BOOT)
#include "../dboot/dboot_asm.h"
#include "../dboot/dboot_xboot.h"
#endif
- #define VGA_COLOR_CRTC_INDEX 0x3d4
- #define VGA_COLOR_CRTC_DATA 0x3d5
-
#if defined(__xpv) && defined(_BOOT)
/*
* Device memory address
*
--- 22,49 ----
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
/*
* Miniature VGA driver for bootstrap.
*/
#include <sys/archsystm.h>
#include <sys/vgareg.h>
+ #include <sys/framebuffer.h>
+ #include <sys/boot_console.h>
+ #include <sys/tem_impl.h>
+ #include "boot_console_impl.h"
#include "boot_vga.h"
#if defined(_BOOT)
#include "../dboot/dboot_asm.h"
#include "../dboot/dboot_xboot.h"
#endif
#if defined(__xpv) && defined(_BOOT)
/*
* Device memory address
*
*** 53,80 ****
* Intead we've mapped the device memory that we need to access into
* a local variable within dboot so we can access the device memory
* there.
*/
extern unsigned short *video_fb;
! #define VGA_SCREEN ((unsigned short *)video_fb)
#else /* __xpv && _BOOT */
/* Device memory address */
#define VGA_SCREEN ((unsigned short *)0xb8000)
#endif /* __xpv && _BOOT */
static void vga_set_crtc(int index, unsigned char val);
static unsigned char vga_get_crtc(int index);
void
! vga_cursor_display(void)
{
unsigned char val, msl;
/*
* Figure out the maximum scan line value. We need this to set the
* cursor size.
*/
msl = vga_get_crtc(VGA_CRTC_MAX_S_LN) & 0x1f;
--- 52,167 ----
* Intead we've mapped the device memory that we need to access into
* a local variable within dboot so we can access the device memory
* there.
*/
extern unsigned short *video_fb;
! #define VGA_SCREEN (video_fb)
#else /* __xpv && _BOOT */
/* Device memory address */
#define VGA_SCREEN ((unsigned short *)0xb8000)
#endif /* __xpv && _BOOT */
+ static int cons_color = CONS_COLOR;
+ static void vga_init(void);
+ static void vga_drawc(int);
+ static void vga_setpos(int, int);
+ static void vga_getpos(int *, int *);
+ static void vga_scroll(int);
+ static void vga_clear(int);
+ static void vga_shiftline(int);
+ static void vga_eraseline(void);
+ static void vga_cursor_display(boolean_t);
+
static void vga_set_crtc(int index, unsigned char val);
static unsigned char vga_get_crtc(int index);
+ static void vga_set_atr(int index, unsigned char val);
+ static unsigned char vga_get_atr(int index);
+ static int
+ set_vga_color(void)
+ {
+ int color;
+ uint8_t tmp;
+
+ /*
+ * Now we have two principal cases, black on white and white on black.
+ * And we have possible inverse to switch them, and we want to
+ * follow the tem logic.. to set VGA TEXT color. FB will take care
+ * of itself in boot_fb.c
+ */
+ if (fb_info.inverse == B_TRUE ||
+ fb_info.inverse_screen == B_TRUE) {
+ tmp = dim_xlate[fb_info.fg_color];
+ color = solaris_color_to_pc_color[tmp] << 4;
+ tmp = brt_xlate[fb_info.bg_color];
+ color |= solaris_color_to_pc_color[tmp];
+ return (color);
+ }
+
+ /* use bright white for background */
+ if (fb_info.bg_color == 7)
+ tmp = brt_xlate[fb_info.bg_color];
+ else
+ tmp = dim_xlate[fb_info.bg_color];
+
+ color = solaris_color_to_pc_color[tmp] << 4;
+ tmp = dim_xlate[fb_info.fg_color];
+ color |= solaris_color_to_pc_color[tmp];
+ return (color);
+ }
+
void
! boot_vga_init(bcons_dev_t *bcons_dev)
{
+ fb_info.terminal.x = VGA_TEXT_COLS;
+ fb_info.terminal.y = VGA_TEXT_ROWS;
+ cons_color = set_vga_color();
+
+ #if defined(_BOOT)
+ /* Note that we have to enable the cursor before clearing the
+ * screen since the cursor position is dependant upon the cursor
+ * skew, which is initialized by vga_cursor_display()
+ */
+ vga_init();
+ fb_info.cursor.visible = B_FALSE;
+ vga_cursor_display(B_TRUE);
+
+ if (fb_info.cursor.pos.x == 0 && fb_info.cursor.pos.y == 0)
+ vga_clear(cons_color);
+ #endif /* _BOOT */
+
+ bcons_dev->bd_putchar = vga_drawc;
+ bcons_dev->bd_eraseline = vga_eraseline;
+ bcons_dev->bd_cursor = vga_cursor_display;
+ bcons_dev->bd_setpos = vga_setpos;
+ bcons_dev->bd_shift = vga_shiftline;
+ }
+
+ static void
+ vga_init(void)
+ {
+ unsigned char val;
+
+ /* set 16bit colors */
+ val = vga_get_atr(VGA_ATR_MODE);
+ val &= ~VGA_ATR_MODE_BLINK;
+ val &= ~VGA_ATR_MODE_9WIDE;
+ vga_set_atr(VGA_ATR_MODE, val);
+ }
+
+ void
+ vga_cursor_display(boolean_t visible)
+ {
unsigned char val, msl;
+ if (fb_info.cursor.visible == visible)
+ return;
+
/*
* Figure out the maximum scan line value. We need this to set the
* cursor size.
*/
msl = vga_get_crtc(VGA_CRTC_MAX_S_LN) & 0x1f;
*** 86,98 ****
* Scanning is done from top-to-bottom. The top-most scan
* line is 0 and the bottom most scan line is the maximum scan
* line value.
* - Bit 5 is the cursor disable bit.
*/
! val = vga_get_crtc(VGA_CRTC_CSSL);
! vga_set_crtc(VGA_CRTC_CSSL, (val & 0xc) | ((msl - 2) & 0x1f));
/*
* Continue setting the cursors size.
* - Bits 0-4 are the ending scan line of the cursor.
* Scanning is done from top-to-bottom. The top-most scan
* line is 0 and the bottom most scan line is the maximum scan
--- 173,189 ----
* Scanning is done from top-to-bottom. The top-most scan
* line is 0 and the bottom most scan line is the maximum scan
* line value.
* - Bit 5 is the cursor disable bit.
*/
! val = vga_get_crtc(VGA_CRTC_CSSL) & 0xc0;
+ if (visible == B_FALSE)
+ val |= (1 << 5);
+
+ vga_set_crtc(VGA_CRTC_CSSL, val);
+
/*
* Continue setting the cursors size.
* - Bits 0-4 are the ending scan line of the cursor.
* Scanning is done from top-to-bottom. The top-most scan
* line is 0 and the bottom most scan line is the maximum scan
*** 100,160 ****
* - Bits 5-6 are the cursor skew.
*/
vga_set_crtc(VGA_CRTC_CESL, msl);
}
!
! void
! vga_clear(int color)
{
! unsigned short val;
int i;
val = (color << 8) | ' ';
! for (i = 0; i < VGA_TEXT_ROWS * VGA_TEXT_COLS; i++) {
! VGA_SCREEN[i] = val;
}
}
! void
! vga_drawc(int c, int color)
{
int row;
int col;
vga_getpos(&row, &col);
! VGA_SCREEN[row*VGA_TEXT_COLS + col] = (color << 8) | c;
}
! void
vga_scroll(int color)
{
- unsigned short val;
int i;
! val = (color << 8) | ' ';
!
! for (i = 0; i < (VGA_TEXT_ROWS-1)*VGA_TEXT_COLS; i++) {
VGA_SCREEN[i] = VGA_SCREEN[i + VGA_TEXT_COLS];
}
! for (; i < VGA_TEXT_ROWS * VGA_TEXT_COLS; i++) {
! VGA_SCREEN[i] = val;
! }
}
! void
vga_setpos(int row, int col)
{
int off;
off = row * VGA_TEXT_COLS + col;
vga_set_crtc(VGA_CRTC_CLAH, off >> 8);
vga_set_crtc(VGA_CRTC_CLAL, off & 0xff);
}
! void
vga_getpos(int *row, int *col)
{
int off;
off = (vga_get_crtc(VGA_CRTC_CLAH) << 8) + vga_get_crtc(VGA_CRTC_CLAL);
--- 191,318 ----
* - Bits 5-6 are the cursor skew.
*/
vga_set_crtc(VGA_CRTC_CESL, msl);
}
! static void
! vga_eraseline_impl(int x, int y, int color)
{
! unsigned short val, *buf;
int i;
+ buf = VGA_SCREEN + x + y * VGA_TEXT_COLS;
val = (color << 8) | ' ';
+ for (i = x; i < VGA_TEXT_COLS; i++)
+ buf[i] = val;
+ }
! static void
! vga_eraseline(void)
! {
! int x, y;
!
! x = fb_info.cursor.pos.x;
! y = fb_info.cursor.pos.y;
! vga_eraseline_impl(x, y, cons_color);
! }
!
! static void
! vga_shiftline(int chars)
! {
! unsigned short *src, *dst;
! int x, y, len;
!
! x = fb_info.cursor.pos.x;
! y = fb_info.cursor.pos.y;
! len = VGA_TEXT_COLS - x - chars;
!
! src = VGA_SCREEN + x + y * VGA_TEXT_COLS;
! dst = src + chars;
! if (dst <= src) {
! do {
! *dst++ = *src++;
! } while (--len != 0);
! } else {
! dst += len;
! src += len;
! do {
! *--dst = *--src;
! } while (--len != 0);
}
}
! static void
! vga_clear(int color)
{
+ int i;
+
+ for (i = 0; i < VGA_TEXT_ROWS; i++)
+ vga_eraseline_impl(0, i, color);
+ }
+
+ static void
+ vga_drawc(int c)
+ {
int row;
int col;
vga_getpos(&row, &col);
!
! if (c == '\n') {
! if (row < fb_info.terminal.y - 1)
! vga_setpos(row + 1, col);
! else
! vga_scroll(cons_color);
! return;
! }
!
! VGA_SCREEN[row*VGA_TEXT_COLS + col] = (cons_color << 8) | c;
!
! if (col < VGA_TEXT_COLS - 1)
! vga_setpos(row, col + 1);
! else if (row < VGA_TEXT_ROWS - 1)
! vga_setpos(row + 1, 0);
! else {
! vga_setpos(row, 0);
! vga_scroll(cons_color);
! }
}
! static void
vga_scroll(int color)
{
int i;
! for (i = 0; i < (VGA_TEXT_ROWS - 1) * VGA_TEXT_COLS; i++) {
VGA_SCREEN[i] = VGA_SCREEN[i + VGA_TEXT_COLS];
}
! vga_eraseline_impl(0, VGA_TEXT_ROWS - 1, color);
}
! static void
vga_setpos(int row, int col)
{
int off;
+ if (row < 0)
+ row = 0;
+ if (row >= fb_info.terminal.y)
+ row = fb_info.terminal.y - 1;
+ if (col < 0)
+ col = 0;
+ if (col >= fb_info.terminal.x)
+ col = fb_info.terminal.x - 1;
+
off = row * VGA_TEXT_COLS + col;
vga_set_crtc(VGA_CRTC_CLAH, off >> 8);
vga_set_crtc(VGA_CRTC_CLAL, off & 0xff);
+
+ fb_info.cursor.pos.y = row;
+ fb_info.cursor.pos.x = col;
}
! static void
vga_getpos(int *row, int *col)
{
int off;
off = (vga_get_crtc(VGA_CRTC_CLAH) << 8) + vga_get_crtc(VGA_CRTC_CLAL);
*** 161,177 ****
*row = off / VGA_TEXT_COLS;
*col = off % VGA_TEXT_COLS;
}
static void
vga_set_crtc(int index, unsigned char val)
{
! outb(VGA_COLOR_CRTC_INDEX, index);
! outb(VGA_COLOR_CRTC_DATA, val);
}
static unsigned char
vga_get_crtc(int index)
{
! outb(VGA_COLOR_CRTC_INDEX, index);
! return (inb(VGA_COLOR_CRTC_DATA));
}
--- 319,361 ----
*row = off / VGA_TEXT_COLS;
*col = off % VGA_TEXT_COLS;
}
static void
+ vga_set_atr(int index, unsigned char val)
+ {
+ (void) inb(VGA_REG_ADDR + CGA_STAT);
+ outb(VGA_REG_ADDR + VGA_ATR_AD, index);
+ outb(VGA_REG_ADDR + VGA_ATR_AD, val);
+
+ (void) inb(VGA_REG_ADDR + CGA_STAT);
+ outb(VGA_REG_ADDR + VGA_ATR_AD, VGA_ATR_ENB_PLT);
+ }
+
+ static unsigned char
+ vga_get_atr(int index)
+ {
+ unsigned char val;
+
+ (void) inb(VGA_REG_ADDR + CGA_STAT);
+ outb(VGA_REG_ADDR + VGA_ATR_AD, index);
+ val = inb(VGA_REG_ADDR + VGA_ATR_DATA);
+
+ (void) inb(VGA_REG_ADDR + CGA_STAT);
+ outb(VGA_REG_ADDR + VGA_ATR_AD, VGA_ATR_ENB_PLT);
+
+ return (val);
+ }
+
+ static void
vga_set_crtc(int index, unsigned char val)
{
! outb(VGA_REG_ADDR + VGA_CRTC_ADR, index);
! outb(VGA_REG_ADDR + VGA_CRTC_DATA, val);
}
static unsigned char
vga_get_crtc(int index)
{
! outb(VGA_REG_ADDR + VGA_CRTC_ADR, index);
! return (inb(VGA_REG_ADDR + VGA_CRTC_DATA));
}