From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZPERx-0003pj-Rv for mharc-grub-devel@gnu.org; Tue, 11 Aug 2015 14:39:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPERu-0003og-TB for grub-devel@gnu.org; Tue, 11 Aug 2015 14:39:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPERq-00041S-LL for grub-devel@gnu.org; Tue, 11 Aug 2015 14:38:58 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:44994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPERq-000416-Cp for grub-devel@gnu.org; Tue, 11 Aug 2015 14:38:54 -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 t7BIcfIk013868 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Aug 2015 18:38:42 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t7BIcfZT022968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 11 Aug 2015 18:38:41 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t7BIcexN009629; Tue, 11 Aug 2015 18:38:40 GMT Received: from l.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 11 Aug 2015 11:38:39 -0700 Received: by l.oracle.com (Postfix, from userid 1000) id 0AB896A3C73; Tue, 11 Aug 2015 14:38:37 -0400 (EDT) Date: Tue, 11 Aug 2015 14:38:36 -0400 From: Konrad Rzeszutek Wilk To: Daniel Kiper Subject: Re: [PATCH v2 4/6] multiboot2: Add tags used to pass ImageHandle to loaded image Message-ID: <20150811183836.GC1292@l.oracle.com> References: <1437402954-7375-1-git-send-email-daniel.kiper@oracle.com> <1437402954-7375-5-git-send-email-daniel.kiper@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437402954-7375-5-git-send-email-daniel.kiper@oracle.com> User-Agent: Mutt/1.5.23 (2014-03-12) 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, grub-devel@gnu.org, wei.liu2@citrix.com, keir@xen.org, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, andrew.cooper3@citrix.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 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, 11 Aug 2015 18:39:00 -0000 On Mon, Jul 20, 2015 at 04:35:52PM +0200, Daniel Kiper wrote: > Add tags used to pass ImageHandle to loaded image. It is used s/loaded image/loaded image if requested./ > by at least ExitBootServices() function. > > Signed-off-by: Daniel Kiper > --- > grub-core/loader/multiboot_mbi2.c | 46 +++++++++++++++++++++++++++++-------- > include/multiboot2.h | 16 +++++++++++++ > 2 files changed, 53 insertions(+), 9 deletions(-) > > diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c > index 8d66e3f..dc9c709 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,16 +409,18 @@ 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) > +#ifdef GRUB_MACHINE_EFI > + 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_efi32_ih), MULTIBOOT_TAG_ALIGN) Shouldn't they be wrapped with #ifdef __x86_64__ (for efi64_ih) and #ifdef __i386__ for the other? Or two functions (in the header?) wrapped with proper #ifdef machinery? > + + 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 > + 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_efi_mmap) > - + efi_mmap_size, MULTIBOOT_TAG_ALIGN) > -#endif > + sizeof (struct multiboot_tag_vbe) + MULTIBOOT_TAG_ALIGN - 1 > + sizeof (struct multiboot_tag_apm) + MULTIBOOT_TAG_ALIGN - 1; > } > @@ -906,11 +910,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 __x86_64__ > + { > + struct multiboot_tag_efi64_ih *tag = (struct multiboot_tag_efi64_ih *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI64_IH; > + tag->size = sizeof (*tag); The other places where sizeof is used ends up using the full structure so it : 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 > + > +#ifdef __i386__ > + { > + struct multiboot_tag_efi32_ih *tag = (struct multiboot_tag_efi32_ih *) ptrorig; > + tag->type = MULTIBOOT_TAG_TYPE_EFI32_IH; > + tag->size = sizeof (*tag); Ditto. > + 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 b3977e3..9f97ddc 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 > @@ -379,6 +381,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 >