From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1afyZ6-0008H3-OS for mharc-grub-devel@gnu.org; Tue, 15 Mar 2016 19:39:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afyZ3-0008Fb-G0 for grub-devel@gnu.org; Tue, 15 Mar 2016 19:39:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afyYy-0004XF-FG for grub-devel@gnu.org; Tue, 15 Mar 2016 19:39:49 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:27760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afyYy-0004Wo-6z for grub-devel@gnu.org; Tue, 15 Mar 2016 19:39:44 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u2FNdWSt026821 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Mar 2016 23:39:32 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u2FNdV0V031551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 15 Mar 2016 23:39:31 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u2FNdUk9011381; Tue, 15 Mar 2016 23:39:30 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 15 Mar 2016 16:39:30 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 845496A00B7; Tue, 15 Mar 2016 19:39:28 -0400 (EDT) Date: Tue, 15 Mar 2016 19:39:28 -0400 From: Konrad Rzeszutek Wilk To: Daniel Kiper Subject: Re: [GRUB2 PATCH v4 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image Message-ID: <20160315233928.GD29495@char.us.oracle.com> References: <1458055562-24950-1-git-send-email-daniel.kiper@oracle.com> <1458055562-24950-3-git-send-email-daniel.kiper@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1458055562-24950-3-git-send-email-daniel.kiper@oracle.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: userv0022.oracle.com [156.151.31.74] 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, grub-devel@gnu.org, eric.snowberg@oracle.com, arvidjaar@gmail.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, xen-devel@lists.xenproject.org, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org, seth.goldberg@oracle.com 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: Tue, 15 Mar 2016 23:39:50 -0000 On Tue, Mar 15, 2016 at 04:25:59PM +0100, Daniel Kiper wrote: > Add tags used to pass ImageHandle to loaded image if requested. > It is used by at least ExitBootServices() function. > > Signed-off-by: Daniel Kiper Reviewed-by: Konrad Rzeszutek Wilk > --- > v4 - suggestions/fixes: > - reduce number of #ifdefs in grub_multiboot_get_mbi_size() > (suggested by Vladimir 'phcoder' Serbinenko). > > v3 - suggestions/fixes: > - mbi EFI related stuff size calculation > should depend on target architecture > (suggested by Konrad Rzeszutek Wilk), > - use plain type instead of pointer > dereference as sizeof() argument > (suggested by Konrad Rzeszutek Wilk), > - improve commit message > (suggested by Konrad Rzeszutek Wilk). > --- > grub-core/loader/multiboot_mbi2.c | 42 ++++++++++++++++++++++++++++++------- > include/multiboot2.h | 16 ++++++++++++++ > 2 files changed, 51 insertions(+), 7 deletions(-) > > diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c > index a3dca90..6c04402 100644 > --- a/grub-core/loader/multiboot_mbi2.c > +++ b/grub-core/loader/multiboot_mbi2.c > @@ -172,6 +172,8 @@ grub_multiboot_load (grub_file_t file, const char *filename) > case MULTIBOOT_TAG_TYPE_NETWORK: > case MULTIBOOT_TAG_TYPE_EFI_MMAP: > case MULTIBOOT_TAG_TYPE_EFI_BS: > + case MULTIBOOT_TAG_TYPE_EFI32_IH: > + case MULTIBOOT_TAG_TYPE_EFI64_IH: > break; > > default: > @@ -407,13 +409,15 @@ grub_multiboot_get_mbi_size (void) > + grub_get_multiboot_mmap_count () > * sizeof (struct multiboot_mmap_entry)), MULTIBOOT_TAG_ALIGN) > + ALIGN_UP (sizeof (struct multiboot_tag_framebuffer), MULTIBOOT_TAG_ALIGN) > - + ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIBOOT_TAG_ALIGN) > - + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALIGN) > + ALIGN_UP (sizeof (struct multiboot_tag_old_acpi) > + sizeof (struct grub_acpi_rsdp_v10), MULTIBOOT_TAG_ALIGN) > + acpiv2_size () > + net_size () > #ifdef GRUB_MACHINE_EFI > + + ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIBOOT_TAG_ALIGN) > + + ALIGN_UP (sizeof (struct multiboot_tag_efi32_ih), MULTIBOOT_TAG_ALIGN) > + + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALIGN) > + + ALIGN_UP (sizeof (struct multiboot_tag_efi64_ih), MULTIBOOT_TAG_ALIGN) > + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap) > + efi_mmap_size, MULTIBOOT_TAG_ALIGN) > #endif > @@ -907,11 +911,35 @@ grub_multiboot_make_mbi (grub_uint32_t *target) > > if (keep_bs) > { > - struct multiboot_tag *tag = (struct multiboot_tag *) ptrorig; > - tag->type = MULTIBOOT_TAG_TYPE_EFI_BS; > - tag->size = sizeof (struct multiboot_tag); > - ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > - / sizeof (grub_properly_aligned_t); > + { > + struct multiboot_tag *tag = (struct multiboot_tag *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI_BS; > + tag->size = sizeof (struct multiboot_tag); > + ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > + > +#ifdef __i386__ > + { > + struct multiboot_tag_efi32_ih *tag = (struct multiboot_tag_efi32_ih *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI32_IH; > + tag->size = sizeof (struct multiboot_tag_efi32_ih); > + tag->pointer = (grub_addr_t) grub_efi_image_handle; > + ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > +#endif > + > +#ifdef __x86_64__ > + { > + struct multiboot_tag_efi64_ih *tag = (struct multiboot_tag_efi64_ih *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI64_IH; > + tag->size = sizeof (struct multiboot_tag_efi64_ih); > + tag->pointer = (grub_addr_t) grub_efi_image_handle; > + ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN) > + / sizeof (grub_properly_aligned_t); > + } > +#endif > } > #endif > > diff --git a/include/multiboot2.h b/include/multiboot2.h > index 46e7b71..f5bebe1 100644 > --- a/include/multiboot2.h > +++ b/include/multiboot2.h > @@ -60,6 +60,8 @@ > #define MULTIBOOT_TAG_TYPE_NETWORK 16 > #define MULTIBOOT_TAG_TYPE_EFI_MMAP 17 > #define MULTIBOOT_TAG_TYPE_EFI_BS 18 > +#define MULTIBOOT_TAG_TYPE_EFI32_IH 19 > +#define MULTIBOOT_TAG_TYPE_EFI64_IH 20 > > #define MULTIBOOT_HEADER_TAG_END 0 > #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1 > @@ -371,6 +373,20 @@ struct multiboot_tag_efi_mmap > multiboot_uint8_t efi_mmap[0]; > }; > > +struct multiboot_tag_efi32_ih > +{ > + multiboot_uint32_t type; > + multiboot_uint32_t size; > + multiboot_uint32_t pointer; > +}; > + > +struct multiboot_tag_efi64_ih > +{ > + multiboot_uint32_t type; > + multiboot_uint32_t size; > + multiboot_uint64_t pointer; > +}; > + > #endif /* ! ASM_FILE */ > > #endif /* ! MULTIBOOT_HEADER */ > -- > 1.7.10.4 >