Changeset View
Changeset View
Standalone View
Standalone View
sys/boot/efi/boot1/boot1.c
| Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Lines | |||||
| #define DSTALL(d) bs->Stall(d) | #define DSTALL(d) bs->Stall(d) | ||||
| #else | #else | ||||
| #define DPRINTF(fmt, ...) {} | #define DPRINTF(fmt, ...) {} | ||||
| #define DSTALL(d) {} | #define DSTALL(d) {} | ||||
| #endif | #endif | ||||
| struct arch_switch archsw; /* MI/MD interface boundary */ | struct arch_switch archsw; /* MI/MD interface boundary */ | ||||
| static const efi_driver_t *efi_drivers[] = { | const efi_driver_t *efi_drivers[] = { | ||||
| &key_inject_driver, | |||||
| &geli_driver, | |||||
| NULL | NULL | ||||
| }; | }; | ||||
| extern struct console efi_console; | extern struct console efi_console; | ||||
| #if defined(__amd64__) || defined(__i386__) | #if defined(__amd64__) || defined(__i386__) | ||||
| extern struct console comconsole; | extern struct console comconsole; | ||||
| extern struct console nullconsole; | extern struct console nullconsole; | ||||
| #endif | #endif | ||||
| ▲ Show 20 Lines • Show All 412 Lines • ▼ Show 20 Lines | if (pool_guid != 0) { | ||||
| currdev.d_dev = &zfs_dev; | currdev.d_dev = &zfs_dev; | ||||
| currdev.d_unit = 0; | currdev.d_unit = 0; | ||||
| currdev.d_type = currdev.d_dev->dv_type; | currdev.d_type = currdev.d_dev->dv_type; | ||||
| currdev.d_opendata = NULL; | currdev.d_opendata = NULL; | ||||
| currdev.pool_guid = pool_guid; | currdev.pool_guid = pool_guid; | ||||
| currdev.root_guid = 0; | currdev.root_guid = 0; | ||||
| devname = efi_fmtdev(&currdev); | devname = efi_fmtdev(&currdev); | ||||
imp: style changes should be separated out.
| |||||
| env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | ||||
| env_nounset); | env_nounset); | ||||
| if (probe_fs(filepath) == 0 && | if (probe_fs(filepath) == 0 && | ||||
| do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | ||||
| *handlep = img->DeviceHandle; | *handlep = img->DeviceHandle; | ||||
| return (0); | return (0); | ||||
| } | } | ||||
| } | } | ||||
| #endif /* EFI_ZFS_BOOT */ | #endif /* EFI_ZFS_BOOT */ | ||||
| /* We have device lists for hd, cd, fd, walk them all. */ | /* We have device lists for hd, cd, fd, walk them all. */ | ||||
| pdi_list = efiblk_get_pdinfo_list(&efipart_hddev); | pdi_list = efiblk_get_pdinfo_list(&efipart_hddev); | ||||
| STAILQ_FOREACH(dp, pdi_list, pd_link) { | STAILQ_FOREACH(dp, pdi_list, pd_link) { | ||||
| struct disk_devdesc currdev; | struct disk_devdesc currdev; | ||||
| currdev.d_dev = &efipart_hddev; | currdev.d_dev = &efipart_hddev; | ||||
| currdev.d_type = currdev.d_dev->dv_type; | currdev.d_type = currdev.d_dev->dv_type; | ||||
| currdev.d_unit = dp->pd_unit; | currdev.d_unit = dp->pd_unit; | ||||
| currdev.d_opendata = NULL; | currdev.d_opendata = NULL; | ||||
| currdev.d_slice = -1; | currdev.d_slice = -1; | ||||
| currdev.d_partition = -1; | currdev.d_partition = -1; | ||||
| devname = efi_fmtdev(&currdev); | devname = efi_fmtdev(&currdev); | ||||
Not Done Inline Actionsstyle change imp: style change | |||||
| env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | ||||
| env_nounset); | env_nounset); | ||||
| if (dp->pd_handle == img->DeviceHandle && | if (dp->pd_handle == img->DeviceHandle && | ||||
| probe_fs(filepath) == 0 && | probe_fs(filepath) == 0 && | ||||
| do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | ||||
| *handlep = img->DeviceHandle; | *handlep = img->DeviceHandle; | ||||
| return (0); | return (0); | ||||
| } | } | ||||
| /* Assuming GPT partitioning. */ | /* Assuming GPT partitioning. */ | ||||
| STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { | STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { | ||||
| if (pp->pd_handle == img->DeviceHandle) { | if (pp->pd_handle == img->DeviceHandle) { | ||||
| currdev.d_slice = pp->pd_unit; | currdev.d_slice = pp->pd_unit; | ||||
| currdev.d_partition = 255; | currdev.d_partition = 255; | ||||
| devname = efi_fmtdev(&currdev); | devname = efi_fmtdev(&currdev); | ||||
Not Done Inline Actionsstyle change imp: style change
| |||||
| env_setenv("currdev", EV_VOLATILE, devname, | env_setenv("currdev", EV_VOLATILE, devname, | ||||
| efi_setcurrdev, env_nounset); | efi_setcurrdev, env_nounset); | ||||
| if (probe_fs(filepath) == 0 && | if (probe_fs(filepath) == 0 && | ||||
| do_load(filepath, bufp, bufsize) == | do_load(filepath, bufp, bufsize) == | ||||
| EFI_SUCCESS) { | EFI_SUCCESS) { | ||||
| *handlep = img->DeviceHandle; | *handlep = img->DeviceHandle; | ||||
| return (0); | return (0); | ||||
| ▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Lines | STAILQ_FOREACH(zi, zfsi_list, zi_link) { | ||||
| currdev.d_dev = &zfs_dev; | currdev.d_dev = &zfs_dev; | ||||
| currdev.d_unit = 0; | currdev.d_unit = 0; | ||||
| currdev.d_type = currdev.d_dev->dv_type; | currdev.d_type = currdev.d_dev->dv_type; | ||||
| currdev.d_opendata = NULL; | currdev.d_opendata = NULL; | ||||
| currdev.pool_guid = zi->zi_pool_guid; | currdev.pool_guid = zi->zi_pool_guid; | ||||
| currdev.root_guid = 0; | currdev.root_guid = 0; | ||||
| devname = efi_fmtdev(&currdev); | devname = efi_fmtdev(&currdev); | ||||
Not Done Inline Actionsstyle change imp: style change
| |||||
| env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | ||||
| env_nounset); | env_nounset); | ||||
| if (probe_fs(filepath) == 0 && | if (probe_fs(filepath) == 0 && | ||||
| do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | ||||
| *handlep = zi->zi_handle; | *handlep = zi->zi_handle; | ||||
| printf("Succeeded\n"); | |||||
Not Done Inline Actionsdebug change should be separate. imp: debug change should be separate. | |||||
| return (0); | return (0); | ||||
| } | } | ||||
| } | } | ||||
| #endif /* EFI_ZFS_BOOT */ | #endif /* EFI_ZFS_BOOT */ | ||||
| /* We have device lists for hd, cd, fd, walk them all. */ | /* We have device lists for hd, cd, fd, walk them all. */ | ||||
| pdi_list = efiblk_get_pdinfo_list(&efipart_hddev); | pdi_list = efiblk_get_pdinfo_list(&efipart_hddev); | ||||
| STAILQ_FOREACH(dp, pdi_list, pd_link) { | STAILQ_FOREACH(dp, pdi_list, pd_link) { | ||||
| struct disk_devdesc currdev; | struct disk_devdesc currdev; | ||||
| currdev.d_dev = &efipart_hddev; | currdev.d_dev = &efipart_hddev; | ||||
| currdev.d_type = currdev.d_dev->dv_type; | currdev.d_type = currdev.d_dev->dv_type; | ||||
| currdev.d_unit = dp->pd_unit; | currdev.d_unit = dp->pd_unit; | ||||
| currdev.d_opendata = NULL; | currdev.d_opendata = NULL; | ||||
| currdev.d_slice = -1; | currdev.d_slice = -1; | ||||
| currdev.d_partition = -1; | currdev.d_partition = -1; | ||||
| devname = efi_fmtdev(&currdev); | devname = efi_fmtdev(&currdev); | ||||
Not Done Inline Actionsstyle change imp: style change | |||||
| env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, | ||||
| env_nounset); | env_nounset); | ||||
| if (probe_fs(filepath) == 0 && | if (probe_fs(filepath) == 0 && | ||||
| do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | ||||
| *handlep = dp->pd_handle; | *handlep = dp->pd_handle; | ||||
| return (0); | return (0); | ||||
| } | } | ||||
| /* Assuming GPT partitioning. */ | /* Assuming GPT partitioning. */ | ||||
| STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { | STAILQ_FOREACH(pp, &dp->pd_part, pd_link) { | ||||
| currdev.d_slice = pp->pd_unit; | currdev.d_slice = pp->pd_unit; | ||||
| currdev.d_partition = 255; | currdev.d_partition = -1; | ||||
Not Done Inline Actionsdon't use magic numbers, define a constant. imp: don't use magic numbers, define a constant. | |||||
| devname = efi_fmtdev(&currdev); | devname = efi_fmtdev(&currdev); | ||||
| env_setenv("currdev", EV_VOLATILE, devname, | env_setenv("currdev", EV_VOLATILE, devname, | ||||
| efi_setcurrdev, env_nounset); | efi_setcurrdev, env_nounset); | ||||
| if (probe_fs(filepath) == 0 && | if (probe_fs(filepath) == 0 && | ||||
| do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | do_load(filepath, bufp, bufsize) == EFI_SUCCESS) { | ||||
| *handlep = pp->pd_handle; | *handlep = pp->pd_handle; | ||||
| ▲ Show 20 Lines • Show All 216 Lines • ▼ Show 20 Lines | #endif | ||||
| archsw.arch_autoload = efi_autoload; | archsw.arch_autoload = efi_autoload; | ||||
| archsw.arch_getdev = efi_getdev; | archsw.arch_getdev = efi_getdev; | ||||
| archsw.arch_copyin = efi_copyin; | archsw.arch_copyin = efi_copyin; | ||||
| archsw.arch_copyout = efi_copyout; | archsw.arch_copyout = efi_copyout; | ||||
| archsw.arch_readin = efi_readin; | archsw.arch_readin = efi_readin; | ||||
| printf(" Loader path: %s\n\n", PATH_LOADER_EFI); | printf(" Loader path: %s\n\n", PATH_LOADER_EFI); | ||||
| printf(" Initializing modules:"); | |||||
| bcache_init(32768, 512); | |||||
| for (i = 0; efi_drivers[i] != NULL; i++) { | for (i = 0; efi_drivers[i] != NULL; i++) { | ||||
| printf(" %s", efi_drivers[i]->name); | |||||
| if (efi_drivers[i]->init != NULL) | if (efi_drivers[i]->init != NULL) | ||||
| efi_drivers[i]->init(); | efi_drivers[i]->init(); | ||||
| } | } | ||||
| printf("Probing devices:"); | |||||
| for (i = 0; devsw[i] != NULL; i++) { | for (i = 0; devsw[i] != NULL; i++) { | ||||
| if (devsw[i]->dv_init != NULL) { | |||||
| printf(" %s", devsw[i]->dv_name); | printf(" %s", devsw[i]->dv_name); | ||||
| if (devsw[i]->dv_init != NULL) { | |||||
| (devsw[i]->dv_init)(); | (devsw[i]->dv_init)(); | ||||
Not Done Inline ActionsThis change should be separate. imp: This change should be separate. | |||||
| } | } | ||||
| } | } | ||||
| putchar('\n'); | putchar('\n'); | ||||
| try_boot(); | try_boot(); | ||||
| /* If we get here, we're out of luck... */ | /* If we get here, we're out of luck... */ | ||||
| panic("No bootable partitions found!"); | panic("No bootable partitions found!"); | ||||
| } | } | ||||
style changes should be separated out.