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>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/boot/sys/boot/i386/loader/chain.c
+++ new/usr/src/boot/sys/boot/i386/loader/chain.c
1 1 /*
2 2 * This file and its contents are supplied under the terms of the
3 3 * Common Development and Distribution License ("CDDL"), version 1.0.
4 4 * You may only use this file in accordance with the terms of version
5 5 * 1.0 of the CDDL.
6 6 *
7 7 * A full copy of the text of the CDDL should have accompanied this
8 8 * source. A copy of the CDDL is also available via the Internet at
9 9 * http://www.illumos.org/license/CDDL.
10 10 */
11 11
12 12 /*
13 13 * Copyright 2015 Toomas Soome <tsoome@me.com>
14 14 */
15 15
16 16 /*
17 17 * Chain loader to load BIOS boot block either from MBR or PBR.
18 18 *
19 19 * Note the boot block location 0000:7c000 conflicts with loader, so we need to
|
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
20 20 * read in to temporary space and relocate on exec, when btx is stopped.
21 21 */
22 22
23 23 #include <sys/cdefs.h>
24 24 #include <stand.h>
25 25 #include <sys/param.h>
26 26 #include <sys/linker.h>
27 27 #include <sys/diskmbr.h>
28 28
29 29 #include "bootstrap.h"
30 +#include "libi386/vbe.h"
30 31 #include "libi386/libi386.h"
31 32 #include "btxv86.h"
32 33
33 34 /*
34 35 * The MBR/VBR is located in first sector of disk/partition.
35 36 * Read 512B to temporary location and set up relocation. Then
36 37 * exec relocator.
37 38 */
38 39 #define SECTOR_SIZE (512)
39 40
40 41 COMMAND_SET(chain, "chain", "chain load boot block from device", command_chain);
41 42
42 43 static int
43 44 command_chain(int argc, char *argv[])
44 45 {
45 46 int fd, len, size = SECTOR_SIZE;
46 47 struct stat st;
47 48 vm_offset_t mem = 0x100000;
48 49 struct i386_devdesc *rootdev;
49 50
50 51 if (argc == 1) {
51 52 command_errmsg = "no device or file name specified";
52 53 return (CMD_ERROR);
53 54 }
54 55 if (argc != 2) {
55 56 command_errmsg = "invalid trailing arguments";
56 57 return (CMD_ERROR);
57 58 }
58 59
59 60 fd = open(argv[1], O_RDONLY);
60 61 if (fd == -1) {
61 62 command_errmsg = "open failed";
62 63 return (CMD_ERROR);
63 64 }
64 65
65 66 len = strlen(argv[1]);
66 67 if (argv[1][len-1] != ':') {
67 68 if (fstat(fd, &st) == -1) {
68 69 command_errmsg = "stat failed";
69 70 close(fd);
70 71 return (CMD_ERROR);
71 72 }
72 73 size = st.st_size;
73 74 } else if (strncmp(argv[1], "disk", 4) != 0) {
74 75 command_errmsg = "can only use disk device";
75 76 close(fd);
76 77 return (CMD_ERROR);
77 78 }
78 79
79 80 i386_getdev((void **)(&rootdev), argv[1], NULL);
80 81 if (rootdev == NULL) {
81 82 command_errmsg = "can't determine root device";
82 83 close(fd);
83 84 return (CMD_ERROR);
84 85 }
85 86
86 87 if (archsw.arch_readin(fd, mem, size) != size) {
87 88 command_errmsg = "failed to read disk";
88 89 close(fd);
|
↓ open down ↓ |
49 lines elided |
↑ open up ↑ |
89 90 return (CMD_ERROR);
90 91 }
91 92 close(fd);
92 93
93 94 if (argv[1][len-1] == ':' &&
94 95 *((uint16_t *)PTOV(mem + DOSMAGICOFFSET)) != DOSMAGIC) {
95 96 command_errmsg = "wrong magic";
96 97 return (CMD_ERROR);
97 98 }
98 99
100 + bios_set_text_mode(3);
99 101 relocater_data[0].src = mem;
100 102 relocater_data[0].dest = 0x7C00;
101 103 relocater_data[0].size = size;
102 104
103 105 relocator_edx = bd_unit2bios(rootdev->d_unit);
104 106 relocator_esi = relocater_size;
105 107 relocator_ds = 0;
106 108 relocator_es = 0;
107 109 relocator_fs = 0;
108 110 relocator_gs = 0;
109 111 relocator_ss = 0;
110 112 relocator_cs = 0;
111 113 relocator_sp = 0x7C00;
112 114 relocator_ip = 0x7C00;
113 115 relocator_a20_enabled = 0;
114 116
115 117 i386_copyin(relocater, 0x600, relocater_size);
116 118
117 119 dev_cleanup();
118 120
119 121 __exec((void *)0x600);
120 122
121 123 panic("exec returned");
122 124 return (CMD_ERROR); /* not reached */
123 125 }
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX