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/io/kb8042/kb8042.c
          +++ new/usr/src/uts/common/io/kb8042/kb8042.c
↓ open down ↓ 151 lines elided ↑ open up ↑
 152  152  #define DRIVER_NAME(dip) ddi_driver_name(dip)
 153  153  
 154  154  static  char    module_name[] = "kb8042";
 155  155  
 156  156  static int kb8042_open(queue_t *qp, dev_t *devp, int flag, int sflag,
 157  157                          cred_t *credp);
 158  158  static int kb8042_close(queue_t *qp, int flag, cred_t *credp);
 159  159  static int kb8042_wsrv();
 160  160  
 161  161  struct module_info kb8042_sinfo = {
 162      -        42,             /* Module ID */
 163      -        module_name,
 164      -        0, 32,          /* Minimum and maximum packet sizes */
 165      -        256, 128        /* High and low water marks */
      162 +        .mi_idnum = 42,                 /* Module ID */
      163 +        .mi_idname = module_name,       /* Module name */
      164 +        .mi_minpsz = 0,                 /* Minimum packet size */
      165 +        .mi_maxpsz = 32,                /* Maximum packet size */
      166 +        .mi_hiwat = 256,                /* High water mark */
      167 +        .mi_lowat = 128                 /* Low water mark */
 166  168  };
 167  169  
 168  170  static struct qinit kb8042_rinit = {
 169      -        NULL, NULL, kb8042_open, kb8042_close, NULL, &kb8042_sinfo, NULL
      171 +        .qi_putp = NULL,
      172 +        .qi_srvp = NULL,
      173 +        .qi_qopen = kb8042_open,
      174 +        .qi_qclose = kb8042_close,
      175 +        .qi_qadmin = NULL,
      176 +        .qi_minfo = &kb8042_sinfo,
      177 +        .qi_mstat = NULL,
      178 +        .qi_rwp = NULL,
      179 +        .qi_infop = NULL,
      180 +        .qi_struiot = 0
 170  181  };
 171  182  
 172  183  static struct qinit kb8042_winit = {
 173      -        putq, kb8042_wsrv, kb8042_open, kb8042_close, NULL, &kb8042_sinfo, NULL
      184 +        .qi_putp = putq,
      185 +        .qi_srvp = kb8042_wsrv,
      186 +        .qi_qopen = kb8042_open,
      187 +        .qi_qclose = kb8042_close,
      188 +        .qi_qadmin = NULL,
      189 +        .qi_minfo = &kb8042_sinfo,
      190 +        .qi_mstat = NULL,
      191 +        .qi_rwp = NULL,
      192 +        .qi_infop = NULL,
      193 +        .qi_struiot = 0
 174  194  };
 175  195  
 176      -struct streamtab
 177      -        kb8042_str_info = { &kb8042_rinit, &kb8042_winit, NULL, NULL };
      196 +struct streamtab kb8042_str_info = {
      197 +        .st_rdinit = &kb8042_rinit,
      198 +        .st_wrinit = &kb8042_winit,
      199 +        .st_muxrinit = NULL,
      200 +        .st_muxwinit = NULL
      201 +};
 178  202  
 179  203  struct kb8042   Kdws = {0};
 180  204  static dev_info_t *kb8042_dip = NULL;
 181  205  
 182  206  static int kb8042_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg,
 183  207                  void **result);
 184  208  static int kb8042_attach(dev_info_t *, ddi_attach_cmd_t);
 185  209  static int kb8042_detach(dev_info_t *, ddi_detach_cmd_t);
 186  210  
 187  211  static  struct cb_ops cb_kb8042_ops = {
 188      -        nulldev,                /* cb_open */
 189      -        nulldev,                /* cb_close */
 190      -        nodev,                  /* cb_strategy */
 191      -        nodev,                  /* cb_print */
 192      -        nodev,                  /* cb_dump */
 193      -        nodev,                  /* cb_read */
 194      -        nodev,                  /* cb_write */
 195      -        nodev,                  /* cb_ioctl */
 196      -        nodev,                  /* cb_devmap */
 197      -        nodev,                  /* cb_mmap */
 198      -        nodev,                  /* cb_segmap */
 199      -        nochpoll,               /* cb_chpoll */
 200      -        ddi_prop_op,            /* cb_prop_op */
 201      -        &kb8042_str_info,       /* cb_stream */
 202      -        D_MP
      212 +        .cb_open = nulldev,
      213 +        .cb_close = nulldev,
      214 +        .cb_strategy = nodev,
      215 +        .cb_print = nodev,
      216 +        .cb_dump = nodev,
      217 +        .cb_read = nodev,
      218 +        .cb_write = nodev,
      219 +        .cb_ioctl = nodev,
      220 +        .cb_devmap = nodev,
      221 +        .cb_mmap = nodev,
      222 +        .cb_segmap = nodev,
      223 +        .cb_chpoll = nochpoll,
      224 +        .cb_prop_op = ddi_prop_op,
      225 +        .cb_str = &kb8042_str_info,
      226 +        .cb_flag = D_MP,
      227 +        .cb_rev = CB_REV,
      228 +        .cb_aread = nodev,
      229 +        .cb_awrite = nodev
 203  230  };
 204  231  
 205  232  struct dev_ops kb8042_ops = {
 206      -        DEVO_REV,               /* devo_rev */
 207      -        0,                      /* devo_refcnt */
 208      -        kb8042_getinfo,         /* devo_getinfo */
 209      -        nulldev,                /* devo_identify */
 210      -        nulldev,                /* devo_probe */
 211      -        kb8042_attach,          /* devo_attach */
 212      -        kb8042_detach,          /* devo_detach */
 213      -        nodev,                  /* devo_reset */
 214      -        &cb_kb8042_ops,         /* devo_cb_ops */
 215      -        (struct bus_ops *)NULL, /* devo_bus_ops */
 216      -        NULL,                   /* devo_power */
 217      -        ddi_quiesce_not_needed, /* devo_quiesce */
      233 +        .devo_rev = DEVO_REV,
      234 +        .devo_refcnt = 0,
      235 +        .devo_getinfo = kb8042_getinfo,
      236 +        .devo_identify = nulldev,
      237 +        .devo_probe = nulldev,
      238 +        .devo_attach = kb8042_attach,
      239 +        .devo_detach = kb8042_detach,
      240 +        .devo_reset = nodev,
      241 +        .devo_cb_ops = &cb_kb8042_ops,
      242 +        .devo_bus_ops = NULL,
      243 +        .devo_power = NULL,
      244 +        .devo_quiesce = ddi_quiesce_not_needed
 218  245  };
 219  246  
 220  247  
 221  248  /*
 222  249   * This is the loadable module wrapper.
 223  250   */
 224  251  #include <sys/modctl.h>
 225  252  
 226  253  /*
 227  254   * Module linkage information for the kernel.
 228  255   */
 229  256  static struct modldrv modldrv = {
 230      -        &mod_driverops, /* Type of module.  This one is a driver */
 231      -        "PS/2 keyboard driver",
 232      -        &kb8042_ops,    /* driver ops */
      257 +        .drv_modops = &mod_driverops,   /* Type of module. */
      258 +        .drv_linkinfo = "PS/2 keyboard driver",
      259 +        .drv_dev_ops = &kb8042_ops,     /* driver ops */
 233  260  };
 234  261  
 235  262  static struct modlinkage modlinkage = {
 236      -        MODREV_1,
 237      -        (void *) &modldrv,
 238      -        NULL
      263 +        .ml_rev = MODREV_1,
      264 +        .ml_linkage = { &modldrv, NULL }
 239  265  };
 240  266  
 241  267  int
 242  268  _init(void)
 243  269  {
 244  270          int     rv;
 245  271  
 246  272          rv = mod_install(&modlinkage);
 247  273          return (rv);
 248  274  }
↓ open down ↓ 1295 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX