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/uts/common/sys/gfx_private.h
+++ new/usr/src/uts/common/sys/gfx_private.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 24 */
25 25
26 26 /*
27 27 * This file defines interfaces consumed by the AGP kernel modules,
28 28 * and indirectly by the DRM system. Please consider everything in
29 29 * this file to be a "contract private interface", and keep in sync
|
↓ open down ↓ |
29 lines elided |
↑ open up ↑ |
30 30 * with the consumers in the "DRM" gate.
31 31 */
32 32
33 33 #ifndef _GFX_PRIVATE_H
34 34 #define _GFX_PRIVATE_H
35 35
36 36 #ifdef __cplusplus
37 37 extern "C" {
38 38 #endif
39 39
40 +
41 +/*
42 + * Updated "glue" for newer libdrm code.
43 + * See: kernel/drm/src/drm_fb_helper.c
44 + */
45 +
46 +typedef char *gfxp_fb_softc_ptr_t;
47 +
40 48 /* Memory cache attributes */
41 49 #define GFXP_MEMORY_CACHED 0
42 50 #define GFXP_MEMORY_UNCACHED 1
43 51 #define GFXP_MEMORY_WRITECOMBINED 2
44 52
53 +enum gfxp_type {
54 + GFXP_BITMAP,
55 + GFXP_VGATEXT
56 +};
57 +
45 58 typedef uint64_t gfx_maddr_t;
59 +typedef char *gfxp_acc_handle_t;
46 60
47 61 extern int gfxp_ddi_segmap_setup(dev_t dev, off_t offset, struct as *as,
48 62 caddr_t *addrp, off_t len, uint_t prot, uint_t maxprot, uint_t flags,
49 63 cred_t *cred, ddi_device_acc_attr_t *accattrp, uint_t rnumber);
50 64
51 65 extern ddi_umem_cookie_t gfxp_umem_cookie_init(caddr_t kva, size_t size);
52 66 extern void gfxp_umem_cookie_destroy(ddi_umem_cookie_t cookie);
53 67 extern int gfxp_devmap_umem_setup(devmap_cookie_t dhc, dev_info_t *dip,
54 68 struct devmap_callback_ctl *callbackops, ddi_umem_cookie_t cookie,
55 69 offset_t off, size_t len, uint_t maxprot, uint_t flags,
56 70 ddi_device_acc_attr_t *accattrp);
57 71 extern void gfxp_map_devmem(devmap_cookie_t dhc, gfx_maddr_t maddr,
58 72 size_t length, ddi_device_acc_attr_t *attrp);
59 73
60 -
61 -typedef char *gfxp_acc_handle_t;
62 74 extern gfxp_acc_handle_t gfxp_pci_init_handle(uint8_t bus, uint8_t slot,
63 75 uint8_t function, uint16_t *vendor, uint16_t *device);
64 76 extern uint8_t gfxp_pci_read_byte(gfxp_acc_handle_t handle, uint16_t offset);
65 77 extern uint16_t gfxp_pci_read_word(gfxp_acc_handle_t handle, uint16_t offset);
66 78 extern uint32_t gfxp_pci_read_dword(gfxp_acc_handle_t handle, uint16_t offset);
67 79 extern void gfxp_pci_write_byte(gfxp_acc_handle_t handle, uint16_t offset,
68 80 uint8_t value);
69 81 extern void gfxp_pci_write_word(gfxp_acc_handle_t handle, uint16_t offset,
70 82 uint16_t value);
71 83 extern void gfxp_pci_write_dword(gfxp_acc_handle_t handle, uint16_t offset,
72 84 uint32_t value);
73 85 extern int gfxp_pci_device_present(uint16_t vendor, uint16_t device);
|
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
74 86
75 87 typedef char *gfxp_kva_t;
76 88 extern gfxp_kva_t gfxp_map_kernel_space(uint64_t start, size_t size,
77 89 uint32_t mode);
78 90 extern void gfxp_unmap_kernel_space(gfxp_kva_t address, size_t size);
79 91 extern int gfxp_va2pa(struct as *as, caddr_t addr, uint64_t *pa);
80 92 extern void gfxp_fix_mem_cache_attrs(caddr_t kva_start, size_t length,
81 93 int cache_attr);
82 94 extern gfx_maddr_t gfxp_convert_addr(paddr_t paddr);
83 95
84 -typedef char *gfxp_vgatext_softc_ptr_t;
96 +extern gfxp_fb_softc_ptr_t gfxp_fb_softc_alloc(void);
97 +extern void gfxp_fb_softc_free(gfxp_fb_softc_ptr_t ptr);
98 +extern int gfxp_fb_attach(dev_info_t *devi, ddi_attach_cmd_t cmd,
99 + gfxp_fb_softc_ptr_t ptr);
100 +extern int gfxp_fb_detach(dev_info_t *devi, ddi_detach_cmd_t cmd,
101 + gfxp_fb_softc_ptr_t ptr);
102 +extern int gfxp_fb_open(dev_t *devp, int flag, int otyp, cred_t *cred,
103 + gfxp_fb_softc_ptr_t ptr);
104 +extern int gfxp_fb_close(dev_t devp, int flag, int otyp, cred_t *cred,
105 + gfxp_fb_softc_ptr_t ptr);
106 +extern int gfxp_fb_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
107 + cred_t *cred, int *rval, gfxp_fb_softc_ptr_t ptr);
85 108
86 -extern gfxp_vgatext_softc_ptr_t gfxp_vgatext_softc_alloc(void);
87 -extern void gfxp_vgatext_softc_free(gfxp_vgatext_softc_ptr_t ptr);
88 -extern int gfxp_vgatext_attach(dev_info_t *devi, ddi_attach_cmd_t cmd,
89 - gfxp_vgatext_softc_ptr_t ptr);
90 -extern int gfxp_vgatext_detach(dev_info_t *devi, ddi_detach_cmd_t cmd,
91 - gfxp_vgatext_softc_ptr_t ptr);
92 -extern int gfxp_vgatext_open(dev_t *devp, int flag, int otyp, cred_t *cred,
93 - gfxp_vgatext_softc_ptr_t ptr);
94 -extern int gfxp_vgatext_close(dev_t devp, int flag, int otyp, cred_t *cred,
95 - gfxp_vgatext_softc_ptr_t ptr);
96 -extern int gfxp_vgatext_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
97 - cred_t *cred, int *rval, gfxp_vgatext_softc_ptr_t ptr);
98 -
99 109 extern int gfxp_mlock_user_memory(caddr_t address, size_t length);
100 110 extern int gfxp_munlock_user_memory(caddr_t address, size_t length);
101 -extern int gfxp_vgatext_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off,
111 +extern int gfxp_fb_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off,
102 112 size_t len, size_t *maplen, uint_t model, void *ptr);
103 113
104 -
105 114 /*
106 - * Updated "glue" for newer libdrm code.
107 - * See: kernel/drm/src/drm_fb_helper.c
108 - */
109 -
110 -/* Same as: gfxp_vgatext_softc_ptr_t; */
111 -typedef char *gfxp_fb_softc_ptr_t;
112 -
113 -/*
114 115 * Used by drm_register_fbops().
115 116 * Note: only setmode is supplied.
116 117 */
117 118 struct gfxp_blt_ops {
118 119 int (*blt)(void *);
119 120 int (*copy) (void *);
120 121 int (*clear) (void *);
121 122 int (*setmode) (int);
122 123 };
123 124
124 125 extern void gfxp_bm_register_fbops(gfxp_fb_softc_ptr_t,
125 126 struct gfxp_blt_ops *);
126 127
127 128 /* See: kernel/drm/src/drm_fb_helper.c */
128 129
129 130 struct gfxp_bm_fb_info {
130 131 uint16_t xres;
131 132 uint16_t yres;
132 133 uint8_t bpp;
133 134 uint8_t depth;
134 135 };
135 136
136 137 void gfxp_bm_getfb_info(gfxp_fb_softc_ptr_t, struct gfxp_bm_fb_info *);
137 138
138 139 /* See: kernel/drm/src/drm_bufs.c etc */
139 140
140 141 caddr_t gfxp_alloc_kernel_space(size_t size); /* vmem_alloc heap_arena */
141 142 void gfxp_free_kernel_space(caddr_t address, size_t size);
142 143
143 144 void gfxp_load_kernel_space(uint64_t start, size_t size,
144 145 uint32_t mode, caddr_t cvaddr);
145 146 void gfxp_unload_kernel_space(caddr_t address, size_t size);
146 147
147 148 /*
148 149 * Note that "mempool" is optional and normally disabled in drm_gem.c
149 150 * (see HAS_MEM_POOL). Let's just stub these out so we can reduce
150 151 * changes from the upstream in the DRM driver code.
151 152 */
152 153 struct gfxp_pmem_cookie {
153 154 ulong_t a, b, c;
154 155 };
155 156 void gfxp_mempool_init(void);
156 157 void gfxp_mempool_destroy(void);
157 158 int gfxp_alloc_from_mempool(struct gfxp_pmem_cookie *, caddr_t *,
158 159 pfn_t *, pgcnt_t, int);
159 160 void gfxp_free_mempool(struct gfxp_pmem_cookie *, caddr_t, size_t);
160 161
161 162 #ifdef __cplusplus
162 163 }
163 164 #endif
164 165
165 166 #endif /* _GFX_PRIVATE_H */
|
↓ open down ↓ |
42 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX