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/common/gpt.c
          +++ new/usr/src/boot/sys/boot/common/gpt.c
↓ open down ↓ 26 lines elided ↑ open up ↑
  27   27  #include <sys/cdefs.h>
  28   28  __FBSDID("$FreeBSD$");
  29   29  
  30   30  #include <sys/param.h>
  31   31  #include <sys/gpt.h>
  32   32  
  33   33  #ifndef LITTLE_ENDIAN
  34   34  #error gpt.c works only for little endian architectures
  35   35  #endif
  36   36  
  37      -#include "crc32.h"
       37 +#include "zlib.h"
  38   38  #include "drv.h"
  39   39  #include "util.h"
  40   40  #include "gpt.h"
  41   41  
  42   42  #define MAXTBLENTS      128
  43   43  
  44   44  static struct gpt_hdr hdr_primary, hdr_backup, *gpthdr;
  45   45  static uint64_t hdr_primary_lba, hdr_backup_lba;
  46   46  static struct gpt_ent table_primary[MAXTBLENTS], table_backup[MAXTBLENTS];
  47   47  static struct gpt_ent *gpttable;
↓ open down ↓ 23 lines elided ↑ open up ↑
  71   71          entries_per_sec = DEV_BSIZE / hdr->hdr_entsz;
  72   72          slba = curent / entries_per_sec;
  73   73          firstent = slba * entries_per_sec;
  74   74          bcopy(&table[firstent], secbuf, DEV_BSIZE);
  75   75          slba += hdr->hdr_lba_table;
  76   76          if (drvwrite(dskp, secbuf, slba, 1)) {
  77   77                  printf("%s: unable to update %s GPT partition table\n",
  78   78                      BOOTPROG, which);
  79   79                  return;
  80   80          }
  81      -        hdr->hdr_crc_table = crc32(table, hdr->hdr_entries * hdr->hdr_entsz);
  82      -        hdr->hdr_crc_self = 0;
  83      -        hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size);
       81 +        hdr->hdr_crc_table = crc32(0, Z_NULL, 0);
       82 +        hdr->hdr_crc_table = crc32(hdr->hdr_crc_table, table,
       83 +            hdr->hdr_entries * hdr->hdr_entsz);
       84 +        hdr->hdr_crc_self = crc32(0, Z_NULL, 0);
       85 +        hdr->hdr_crc_self = crc32(hdr->hdr_crc_self, hdr, hdr->hdr_size);
  84   86          bzero(secbuf, DEV_BSIZE);
  85   87          bcopy(hdr, secbuf, hdr->hdr_size);
  86   88          if (drvwrite(dskp, secbuf, hdr->hdr_lba_self, 1)) {
  87   89                  printf("%s: unable to update %s GPT header\n", BOOTPROG, which);
  88   90                  return;
  89   91          }
  90   92  }
  91   93  
  92   94  int
  93   95  gptfind(const uuid_t *uuid, struct dsk *dskp, int part)
↓ open down ↓ 99 lines elided ↑ open up ↑
 193  195          }
 194  196          bcopy(secbuf, hdr, sizeof(*hdr));
 195  197          if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 ||
 196  198              hdr->hdr_lba_self != hdrlba || hdr->hdr_revision < 0x00010000 ||
 197  199              hdr->hdr_entsz < sizeof(struct gpt_ent) ||
 198  200              hdr->hdr_entries > MAXTBLENTS || DEV_BSIZE % hdr->hdr_entsz != 0) {
 199  201                  printf("%s: invalid %s GPT header\n", BOOTPROG, which);
 200  202                  return (-1);
 201  203          }
 202  204          crc = hdr->hdr_crc_self;
 203      -        hdr->hdr_crc_self = 0;
 204      -        if (crc32(hdr, hdr->hdr_size) != crc) {
      205 +        hdr->hdr_crc_self = crc32(0, Z_NULL, 0);
      206 +        if (crc32(hdr->hdr_crc_self, hdr, hdr->hdr_size) != crc) {
 205  207                  printf("%s: %s GPT header checksum mismatch\n", BOOTPROG,
 206  208                      which);
 207  209                  return (-1);
 208  210          }
 209  211          hdr->hdr_crc_self = crc;
 210  212          return (0);
 211  213  }
 212  214  
 213  215  void
 214  216  gptbootfailed(struct dsk *dskp)
↓ open down ↓ 45 lines elided ↑ open up ↑
 260  262                  if (!sector_updated)
 261  263                          continue;
 262  264                  bcopy(&table[nent], secbuf, DEV_BSIZE);
 263  265                  if (drvwrite(dskp, secbuf, slba, 1)) {
 264  266                          printf("%s: unable to update %s GPT partition table\n",
 265  267                              BOOTPROG, which);
 266  268                  }
 267  269          }
 268  270          if (!table_updated)
 269  271                  return;
 270      -        hdr->hdr_crc_table = crc32(table, hdr->hdr_entries * hdr->hdr_entsz);
 271      -        hdr->hdr_crc_self = 0;
 272      -        hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size);
      272 +        hdr->hdr_crc_table = crc32(0, Z_NULL, 0);
      273 +        hdr->hdr_crc_table = crc32(hdr->hdr_crc_table, table,
      274 +            hdr->hdr_entries * hdr->hdr_entsz);
      275 +        hdr->hdr_crc_self = crc32(0, Z_NULL, 0);
      276 +        hdr->hdr_crc_self = crc32(hdr->hdr_crc_self, hdr, hdr->hdr_size);
 273  277          bzero(secbuf, DEV_BSIZE);
 274  278          bcopy(hdr, secbuf, hdr->hdr_size);
 275  279          if (drvwrite(dskp, secbuf, hdr->hdr_lba_self, 1))
 276  280                  printf("%s: unable to update %s GPT header\n", BOOTPROG, which);
 277  281  }
 278  282  
 279  283  static int
 280  284  gptread_table(const char *which, const uuid_t *uuid, struct dsk *dskp,
 281  285      struct gpt_hdr *hdr, struct gpt_ent *table)
 282  286  {
↓ open down ↓ 17 lines elided ↑ open up ↑
 300  304                  ent = (struct gpt_ent *)secbuf;
 301  305                  for (part = 0; part < entries_per_sec; part++, ent++) {
 302  306                          bcopy(ent, &table[nent], sizeof(table[nent]));
 303  307                          if (++nent >= hdr->hdr_entries)
 304  308                                  break;
 305  309                  }
 306  310                  if (nent >= hdr->hdr_entries)
 307  311                          break;
 308  312                  slba++;
 309  313          }
 310      -        if (crc32(table, nent * hdr->hdr_entsz) != hdr->hdr_crc_table) {
      314 +        if (crc32(0, table, nent * hdr->hdr_entsz) != hdr->hdr_crc_table) {
 311  315                  printf("%s: %s GPT table checksum mismatch\n", BOOTPROG, which);
 312  316                  return (-1);
 313  317          }
 314  318          return (0);
 315  319  }
 316  320  
 317  321  int
 318  322  gptread(const uuid_t *uuid, struct dsk *dskp, char *buf)
 319  323  {
 320  324          uint64_t altlba;
↓ open down ↓ 61 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX