From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZHC61-0005VY-1C for mharc-grub-devel@gnu.org; Mon, 20 Jul 2015 10:31:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHC5v-0005JL-Bv for grub-devel@gnu.org; Mon, 20 Jul 2015 10:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHC5p-00014M-Ab for grub-devel@gnu.org; Mon, 20 Jul 2015 10:31:03 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:48983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHC5p-00014G-47 for grub-devel@gnu.org; Mon, 20 Jul 2015 10:30:57 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t6KEUjWG009049 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 20 Jul 2015 14:30:45 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t6KEUjsd018032 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 20 Jul 2015 14:30:45 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t6KEUjRL027913; Mon, 20 Jul 2015 14:30:45 GMT Received: from olila.local.net-space.pl (/10.175.255.176) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 20 Jul 2015 07:30:44 -0700 From: Daniel Kiper To: xen-devel@lists.xenproject.org, grub-devel@gnu.org Subject: [PATCH v2 18/23] efi: split out efi_exit_boot() Date: Mon, 20 Jul 2015 16:29:13 +0200 Message-Id: <1437402558-7313-19-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437402558-7313-1-git-send-email-daniel.kiper@oracle.com> References: <1437402558-7313-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 156.151.31.81 Cc: jgross@suse.com, keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, wei.liu2@citrix.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2015 14:31:06 -0000 ..which gets memory map and calls ExitBootServices(). We want to re-use this code to support multiboot2 protocol on EFI platforms. Signed-off-by: Daniel Kiper --- v2 - suggestions/fixes: - improve commit message (suggested by Jan Beulich). --- xen/common/efi/boot.c | 92 +++++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 04b9c7e..bf2f198 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -879,6 +879,53 @@ static void __init efi_set_gop_mode(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, UINTN gop efi_arch_video_init(gop, info_size, mode_info); } +static void __init efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) +{ + EFI_STATUS status; + UINTN info_size = 0, map_key; + bool_t retry; + + efi_bs->GetMemoryMap(&info_size, NULL, &map_key, + &efi_mdesc_size, &mdesc_ver); + info_size += 8 * efi_mdesc_size; + efi_memmap = efi_arch_allocate_mmap_buffer(info_size); + if ( !efi_memmap ) + blexit(L"Unable to allocate memory for EFI memory map"); + + for ( retry = 0; ; retry = 1 ) + { + efi_memmap_size = info_size; + status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, + efi_memmap, &map_key, + &efi_mdesc_size, + &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); + + efi_arch_process_memory_map(SystemTable, efi_memmap, efi_memmap_size, + efi_mdesc_size, mdesc_ver); + + efi_arch_pre_exit_boot(); + + status = SystemTable->BootServices->ExitBootServices(ImageHandle, + map_key); + efi_bs = NULL; + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } + + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot exit boot services", status); + + /* Adjust pointers into EFI. */ + efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP + efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; +#endif + efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; + efi_fw_vendor = (void *)efi_fw_vendor + DIRECTMAP_VIRT_START; +} + static int __init __maybe_unused set_color(u32 mask, int bpp, u8 *pos, u8 *sz) { if ( bpp < 0 ) @@ -903,11 +950,11 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN map_key, info_size, gop_mode = ~0; + UINTN gop_mode = ~0; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; union string section = { NULL }, name; - bool_t base_video = 0, retry; + bool_t base_video = 0; char *option_str; bool_t use_cfg_file; @@ -1125,46 +1172,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_set_gop_mode(gop, gop_mode); - info_size = 0; - efi_bs->GetMemoryMap(&info_size, NULL, &map_key, - &efi_mdesc_size, &mdesc_ver); - info_size += 8 * efi_mdesc_size; - efi_memmap = efi_arch_allocate_mmap_buffer(info_size); - if ( !efi_memmap ) - blexit(L"Unable to allocate memory for EFI memory map"); - - for ( retry = 0; ; retry = 1 ) - { - efi_memmap_size = info_size; - status = SystemTable->BootServices->GetMemoryMap(&efi_memmap_size, - efi_memmap, &map_key, - &efi_mdesc_size, - &mdesc_ver); - if ( EFI_ERROR(status) ) - PrintErrMesg(L"Cannot obtain memory map", status); - - efi_arch_process_memory_map(SystemTable, efi_memmap, efi_memmap_size, - efi_mdesc_size, mdesc_ver); - - efi_arch_pre_exit_boot(); - - status = SystemTable->BootServices->ExitBootServices(ImageHandle, - map_key); - efi_bs = NULL; - if ( status != EFI_INVALID_PARAMETER || retry ) - break; - } - - if ( EFI_ERROR(status) ) - PrintErrMesg(L"Cannot exit boot services", status); - - /* Adjust pointers into EFI. */ - efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#ifdef USE_SET_VIRTUAL_ADDRESS_MAP - efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; -#endif - efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; - efi_fw_vendor = (void *)efi_fw_vendor + DIRECTMAP_VIRT_START; + efi_exit_boot(ImageHandle, SystemTable); efi_arch_post_exit_boot(); for( ; ; ); /* not reached */ -- 1.7.10.4