From: "Vladimir 'phcoder' Serbinenko" <phcoder@gmail.com>
To: Daniel Kiper <daniel.kiper@oracle.com>
Cc: "jgross@suse.com" <jgross@suse.com>,
"grub-devel@gnu.org" <grub-devel@gnu.org>,
"eric.snowberg@oracle.com" <eric.snowberg@oracle.com>,
"arvidjaar@gmail.com" <arvidjaar@gmail.com>,
"andrew.cooper3@citrix.com" <andrew.cooper3@citrix.com>,
"cardoe@cardoe.com" <cardoe@cardoe.com>,
"pgnet.dev@gmail.com" <pgnet.dev@gmail.com>,
"roy.franz@linaro.org" <roy.franz@linaro.org>,
"ning.sun@intel.com" <ning.sun@intel.com>,
"david.vrabel@citrix.com" <david.vrabel@citrix.com>,
"jbeulich@suse.com" <jbeulich@suse.com>,
"stefano.stabellini@eu.citrix.com"
<stefano.stabellini@eu.citrix.com>,
"xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
"qiaowei.ren@intel.com" <qiaowei.ren@intel.com>,
"richard.l.maliszewski@intel.com"
<richard.l.maliszewski@intel.com>,
"gang.wei@intel.com" <gang.wei@intel.com>,
"fu.wei@linaro.org" <fu.wei@linaro.org>,
"seth.goldberg@oracle.com" <seth>
Subject: Re: [GRUB2 PATCH v3 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image
Date: Thu, 10 Mar 2016 21:26:06 +0100 [thread overview]
Message-ID: <CAEaD8JO_K74jVJFUAm2H9Ki7y-PQa8AM_Den9BDQYBEqvjLKPA@mail.gmail.com> (raw)
In-Reply-To: <1456937500-7855-3-git-send-email-daniel.kiper@oracle.com>
[-- Attachment #1.1: Type: text/plain, Size: 5488 bytes --]
On Wednesday, March 2, 2016, Daniel Kiper <daniel.kiper@oracle.com> 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 <daniel.kiper@oracle.com <javascript:;>>
> ---
> 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 | 50
> ++++++++++++++++++++++++++++++-------
> include/multiboot2.h | 16 ++++++++++++
> 2 files changed, 57 insertions(+), 9 deletions(-)
>
> diff --git a/grub-core/loader/multiboot_mbi2.c
> b/grub-core/loader/multiboot_mbi2.c
> index a3dca90..7591edc 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,22 @@ 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
> +#ifdef __i386__
> + ALIGN_UP (sizeof (struct multiboot_tag_efi32), MULTIBOOT_TAG_ALIGN)
> + + ALIGN_UP (sizeof (struct multiboot_tag_efi32_ih),
> MULTIBOOT_TAG_ALIGN)
> +#endif
> +#ifdef __x86_64__
> + ALIGN_UP (sizeof (struct multiboot_tag_efi64), MULTIBOOT_TAG_ALIGN)
> + + ALIGN_UP (sizeof (struct multiboot_tag_efi64_ih),
> MULTIBOOT_TAG_ALIGN)
> +#endif
> + + ALIGN_UP (sizeof (struct multiboot_tag_efi_mmap)
> + + efi_mmap_size, MULTIBOOT_TAG_ALIGN)
> +#endif
>
It doesn't need to be exact. It's just an upper bound. Feel free to
simplify knowing this, removing few #ifdef.
> + 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;
> }
> @@ -907,11 +915,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 d96aa40..36a174f 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
>
Is there a followup to define those in texi doc as well?
>
> #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
>
>
--
Regards
Vladimir 'phcoder' Serbinenko
[-- Attachment #1.2: Type: text/html, Size: 6800 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-10 20:26 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 16:51 [GRUB2 PATCH v3 0/4] multiboot2: Add two extensions Daniel Kiper
2016-03-02 16:51 ` [GRUB2 PATCH v3 1/4] i386/relocator: Add grub_relocator64_efi relocator Daniel Kiper
2016-03-10 20:23 ` Vladimir 'phcoder' Serbinenko
2016-03-11 13:23 ` Daniel Kiper
2016-03-11 15:41 ` Vladimir 'phcoder' Serbinenko
2016-03-11 15:42 ` Vladimir 'phcoder' Serbinenko
2016-03-11 16:40 ` Daniel Kiper
2016-03-02 16:51 ` [GRUB2 PATCH v3 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image Daniel Kiper
2016-03-10 20:26 ` Vladimir 'phcoder' Serbinenko [this message]
2016-03-11 13:27 ` Daniel Kiper
2016-03-11 15:39 ` Vladimir 'phcoder' Serbinenko
2016-03-02 16:51 ` [GRUB2 PATCH v3 3/4] multiboot2: Do not pass memory maps to image if EFI boot services are enabled Daniel Kiper
2016-03-10 20:28 ` Vladimir 'phcoder' Serbinenko
2016-03-11 13:30 ` Daniel Kiper
2016-03-02 16:51 ` [GRUB2 PATCH v3 4/4] multiboot2: Add support for relocatable images Daniel Kiper
2016-03-04 6:51 ` Juergen Gross
2016-03-10 20:42 ` Vladimir 'phcoder' Serbinenko
2016-03-10 20:41 ` Vladimir 'phcoder' Serbinenko
2016-03-11 16:06 ` Daniel Kiper
2016-03-11 16:13 ` Vladimir 'phcoder' Serbinenko
2016-03-14 11:38 ` Daniel Kiper
2016-03-10 20:44 ` Vladimir 'phcoder' Serbinenko
2016-03-11 16:23 ` Daniel Kiper
2016-03-09 10:48 ` [GRUB2 PATCH v3 0/4] multiboot2: Add two extensions Daniel Kiper
2016-03-11 12:27 ` Vladimir 'phcoder' Serbinenko
2016-03-11 13:14 ` Daniel Kiper
2016-03-11 15:44 ` Vladimir 'phcoder' Serbinenko
2016-03-11 16:32 ` Daniel Kiper
2016-03-11 17:33 ` Vladimir 'phcoder' Serbinenko
2016-03-11 17:49 ` Daniel Kiper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEaD8JO_K74jVJFUAm2H9Ki7y-PQa8AM_Den9BDQYBEqvjLKPA@mail.gmail.com \
--to=phcoder@gmail.com \
--cc=andrew.cooper3@citrix.com \
--cc=arvidjaar@gmail.com \
--cc=cardoe@cardoe.com \
--cc=daniel.kiper@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=eric.snowberg@oracle.com \
--cc=fu.wei@linaro.org \
--cc=gang.wei@intel.com \
--cc=grub-devel@gnu.org \
--cc=jbeulich@suse.com \
--cc=jgross@suse.com \
--cc=ning.sun@intel.com \
--cc=pgnet.dev@gmail.com \
--cc=qiaowei.ren@intel.com \
--cc=richard.l.maliszewski@intel.com \
--cc=roy.franz@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).