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>
        
*** 30,58 ****
--- 30,73 ----
   * standard, available at http://www.itl.nist.gov/fipspubs/fip180-1.htm
   * Not as fast as one would like -- further optimizations are encouraged
   * and appreciated.
   */
  
+ #if defined(_STANDALONE)
+ #include <sys/cdefs.h>
+ #define _RESTRICT_KYWD  restrict
+ #else
  #if !defined(_KERNEL) && !defined(_BOOT)
  #include <stdint.h>
  #include <strings.h>
  #include <stdlib.h>
  #include <errno.h>
  #include <sys/systeminfo.h>
  #endif  /* !_KERNEL && !_BOOT */
+ #endif  /* _STANDALONE */
  
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/systm.h>
  #include <sys/sysmacros.h>
  #include <sys/sha1.h>
  #include <sys/sha1_consts.h>
  
+ #if defined(_STANDALONE)
+ #include <sys/endian.h>
+ #define HAVE_HTONL
+ #if _BYTE_ORDER == _LITTLE_ENDIAN
+ #undef _BIG_ENDIAN
+ #else
+ #undef _LITTLE_ENDIAN
+ #endif
+ #else
  #ifdef _LITTLE_ENDIAN
  #include <sys/byteorder.h>
  #define HAVE_HTONL
  #endif
+ #endif
  
  #ifdef  _BOOT
  #define bcopy(_s, _d, _l)       ((void) memcpy((_d), (_s), (_l)))
  #define bzero(_m, _l)           ((void) memset((_m), 0, (_l)))
  #endif
*** 66,76 ****
                  (ctx)->state[3], (ctx)->state[4], (ctx), (in))
  
  static void SHA1Transform(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
      SHA1_CTX *, const uint8_t *);
  
! #elif   defined(__amd64)
  
  #define SHA1_TRANSFORM(ctx, in) sha1_block_data_order((ctx), (in), 1)
  #define SHA1_TRANSFORM_BLOCKS(ctx, in, num) sha1_block_data_order((ctx), \
                  (in), (num))
  
--- 81,91 ----
                  (ctx)->state[3], (ctx)->state[4], (ctx), (in))
  
  static void SHA1Transform(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
      SHA1_CTX *, const uint8_t *);
  
! #elif   defined(__amd64) && !defined(_STANDALONE)
  
  #define SHA1_TRANSFORM(ctx, in) sha1_block_data_order((ctx), (in), 1)
  #define SHA1_TRANSFORM_BLOCKS(ctx, in, num) sha1_block_data_order((ctx), \
                  (in), (num))
  
*** 332,342 ****
  void
  SHA1Update(SHA1_CTX *ctx, const void *inptr, size_t input_len)
  {
          uint32_t i, buf_index, buf_len;
          const uint8_t *input = inptr;
! #if defined(__amd64)
          uint32_t        block_count;
  #endif  /* __amd64 */
  
          /* check for noop */
          if (input_len == 0)
--- 347,357 ----
  void
  SHA1Update(SHA1_CTX *ctx, const void *inptr, size_t input_len)
  {
          uint32_t i, buf_index, buf_len;
          const uint8_t *input = inptr;
! #if defined(__amd64) && !defined(_STANDALONE)
          uint32_t        block_count;
  #endif  /* __amd64 */
  
          /* check for noop */
          if (input_len == 0)
*** 371,381 ****
                          bcopy(input, &ctx->buf_un.buf8[buf_index], buf_len);
                          SHA1_TRANSFORM(ctx, ctx->buf_un.buf8);
                          i = buf_len;
                  }
  
! #if !defined(__amd64)
                  for (; i + 63 < input_len; i += 64)
                          SHA1_TRANSFORM(ctx, &input[i]);
  #else
                  block_count = (input_len - i) >> 6;
                  if (block_count > 0) {
--- 386,396 ----
                          bcopy(input, &ctx->buf_un.buf8[buf_index], buf_len);
                          SHA1_TRANSFORM(ctx, ctx->buf_un.buf8);
                          i = buf_len;
                  }
  
! #if !defined(__amd64) || defined(_STANDALONE)
                  for (; i + 63 < input_len; i += 64)
                          SHA1_TRANSFORM(ctx, &input[i]);
  #else
                  block_count = (input_len - i) >> 6;
                  if (block_count > 0) {
*** 437,447 ****
          /* zeroize sensitive information */
          bzero(ctx, sizeof (*ctx));
  }
  
  
! #if !defined(__amd64)
  
  typedef uint32_t sha1word;
  
  /*
   * sparc optimization:
--- 452,462 ----
          /* zeroize sensitive information */
          bzero(ctx, sizeof (*ctx));
  }
  
  
! #if !defined(__amd64) || defined(_STANDALONE)
  
  typedef uint32_t sha1word;
  
  /*
   * sparc optimization: