db7cf3a089
Add some fixes for BLS parsing logic and also make 20-grub.install script to query the relative path of the kernel and initramfs images, so BLS can also work when /boot is not a mount point or is a btrfs subvolume. Also pull some build fixes. Resolves: rhbz#1588184 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
121 lines
4.1 KiB
Diff
121 lines
4.1 KiB
Diff
From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001
|
|
From: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Date: Thu, 3 Aug 2017 11:04:23 +0100
|
|
Subject: [PATCH 056/243] efi: refactor grub_efi_allocate_pages
|
|
|
|
Expose a new function, grub_efi_allocate_pages_real(), making it possible
|
|
to specify allocation type and memory type as supported by the UEFI
|
|
AllocatePages boot service.
|
|
|
|
Make grub_efi_allocate_pages() a consumer of the new function,
|
|
maintaining its old functionality.
|
|
|
|
Also delete some left-around #if 1/#else blocks in the affected
|
|
functions.
|
|
|
|
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
---
|
|
grub-core/kern/efi/mm.c | 46 ++++++++++++++++++++++++----------------------
|
|
include/grub/efi/efi.h | 5 +++++
|
|
2 files changed, 29 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
|
|
index 20a47aaf5d0..d88bc5e4326 100644
|
|
--- a/grub-core/kern/efi/mm.c
|
|
+++ b/grub-core/kern/efi/mm.c
|
|
@@ -51,36 +51,20 @@ int grub_efi_is_finished = 0;
|
|
|
|
/* Allocate pages. Return the pointer to the first of allocated pages. */
|
|
void *
|
|
-grub_efi_allocate_pages (grub_efi_physical_address_t address,
|
|
- grub_efi_uintn_t pages)
|
|
+grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
|
|
+ grub_efi_uintn_t pages,
|
|
+ grub_efi_allocate_type_t alloctype,
|
|
+ grub_efi_memory_type_t memtype)
|
|
{
|
|
- grub_efi_allocate_type_t type;
|
|
grub_efi_status_t status;
|
|
grub_efi_boot_services_t *b;
|
|
|
|
-#if 1
|
|
/* Limit the memory access to less than 4GB for 32-bit platforms. */
|
|
if (address > GRUB_EFI_MAX_USABLE_ADDRESS)
|
|
return 0;
|
|
-#endif
|
|
-
|
|
-#if 1
|
|
- if (address == 0)
|
|
- {
|
|
- type = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
|
|
- address = GRUB_EFI_MAX_USABLE_ADDRESS;
|
|
- }
|
|
- else
|
|
- type = GRUB_EFI_ALLOCATE_ADDRESS;
|
|
-#else
|
|
- if (address == 0)
|
|
- type = GRUB_EFI_ALLOCATE_ANY_PAGES;
|
|
- else
|
|
- type = GRUB_EFI_ALLOCATE_ADDRESS;
|
|
-#endif
|
|
|
|
b = grub_efi_system_table->boot_services;
|
|
- status = efi_call_4 (b->allocate_pages, type, GRUB_EFI_LOADER_DATA, pages, &address);
|
|
+ status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
return 0;
|
|
|
|
@@ -89,7 +73,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
|
|
/* Uggh, the address 0 was allocated... This is too annoying,
|
|
so reallocate another one. */
|
|
address = GRUB_EFI_MAX_USABLE_ADDRESS;
|
|
- status = efi_call_4 (b->allocate_pages, type, GRUB_EFI_LOADER_DATA, pages, &address);
|
|
+ status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
|
|
grub_efi_free_pages (0, pages);
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
return 0;
|
|
@@ -98,6 +82,24 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
|
|
return (void *) ((grub_addr_t) address);
|
|
}
|
|
|
|
+void *
|
|
+grub_efi_allocate_pages (grub_efi_physical_address_t address,
|
|
+ grub_efi_uintn_t pages)
|
|
+{
|
|
+ grub_efi_allocate_type_t alloctype;
|
|
+
|
|
+ if (address == 0)
|
|
+ {
|
|
+ alloctype = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
|
|
+ address = GRUB_EFI_MAX_USABLE_ADDRESS;
|
|
+ }
|
|
+ else
|
|
+ alloctype = GRUB_EFI_ALLOCATE_ADDRESS;
|
|
+
|
|
+ return grub_efi_allocate_pages_real (address, pages, alloctype,
|
|
+ GRUB_EFI_LOADER_DATA);
|
|
+}
|
|
+
|
|
/* Free pages starting from ADDRESS. */
|
|
void
|
|
grub_efi_free_pages (grub_efi_physical_address_t address,
|
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
|
index e9c601f3410..b4cbebf3828 100644
|
|
--- a/include/grub/efi/efi.h
|
|
+++ b/include/grub/efi/efi.h
|
|
@@ -38,6 +38,11 @@ void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,
|
|
int EXPORT_FUNC(grub_efi_set_text_mode) (int on);
|
|
void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);
|
|
void *
|
|
+EXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,
|
|
+ grub_efi_uintn_t pages,
|
|
+ grub_efi_allocate_type_t alloctype,
|
|
+ grub_efi_memory_type_t memtype);
|
|
+void *
|
|
EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
|
|
grub_efi_uintn_t pages);
|
|
void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
|
|
--
|
|
2.17.1
|
|
|