[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [GRUB2 PATCH v4 2/4] multiboot2: Add tags used to pass ImageHandle t
From: |
Konrad Rzeszutek Wilk |
Subject: |
Re: [GRUB2 PATCH v4 2/4] multiboot2: Add tags used to pass ImageHandle to loaded image |
Date: |
Tue, 15 Mar 2016 19:39:28 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
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 <address@hidden>
Reviewed-by: Konrad Rzeszutek Wilk <address@hidden>
> ---
> 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
>
[GRUB2 PATCH v4 3/4 - FOR COMMIT] multiboot2: Do not pass memory maps to image if EFI boot services are enabled, Daniel Kiper, 2016/03/15