From owner-svn-src-user@freebsd.org Fri Feb 5 08:25:22 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1647CA47045 for ; Fri, 5 Feb 2016 08:25:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3B2DEC9; Fri, 5 Feb 2016 08:25:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158PKtL025414; Fri, 5 Feb 2016 08:25:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158PKFf025413; Fri, 5 Feb 2016 08:25:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201602050825.u158PKFf025413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 5 Feb 2016 08:25:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r295310 - user/ngie/stable-10-libnv/sys/boot/ia64/efi X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2016 08:25:22 -0000 Author: ngie Date: Fri Feb 5 08:25:20 2016 New Revision: 295310 URL: https://svnweb.freebsd.org/changeset/base/295310 Log: First attempt at unbreaking the ia64 EFI bootloader by MFstable/10 @ r294999 and slightly tweak the support to add ZFS support to the EFI bootloader by smh Requested by: gjb, peter Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c ============================================================================== --- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 07:29:11 2016 (r295309) +++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 08:25:20 2016 (r295310) @@ -144,6 +144,7 @@ main(int argc, CHAR16 *argv[]) EFI_LOADED_IMAGE *img; char *dev; int i; + uint64_t pool_guid; /* * XXX Chicken-and-egg problem; we want to have console output @@ -179,15 +180,44 @@ main(int argc, CHAR16 *argv[]) BS->HandleProtocol(IH, &imgid, (VOID**)&img); bzero(&currdev, sizeof(currdev)); - efi_handle_lookup(img->DeviceHandle, &currdev.d_dev, &currdev.d_unit); - currdev.d_type = currdev.d_dev->dv_type; - - env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset, - env_nounset); - - dev = get_dev_option(argc, argv); - if (dev == NULL) - dev = ia64_fmtdev(&currdev); + if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, &pool_guid) != 0) + return (EFI_NOT_FOUND); + switch (dev->dv_type) { +#ifdef EFI_ZFS_BOOT + case DEVT_ZFS: { + struct zfs_devdesc currdev; + + currdev.d_dev = dev; + currdev.d_unit = unit; + currdev.d_type = currdev.d_dev->dv_type; + currdev.d_opendata = NULL; + currdev.pool_guid = pool_guid; + currdev.root_guid = 0; + env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev), + efi_setcurrdev, env_nounset); + env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset, + env_nounset); + break; + } +#endif + default: { + struct devdesc currdev; + + dev = get_dev_option(argc, argv); + if (dev == NULL) + dev = ia64_fmtdev(&currdev); + + currdev.d_dev = dev; + currdev.d_unit = unit; + currdev.d_opendata = NULL; + currdev.d_type = currdev.d_dev->dv_type; + env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev), + efi_setcurrdev, env_nounset); + env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset, + env_nounset); + break; + } + } env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);