bbc6a89
From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001
bbc6a89
From: Leif Lindholm <leif.lindholm@linaro.org>
bbc6a89
Date: Thu, 3 Aug 2017 11:04:23 +0100
63f1a98
Subject: [PATCH 056/250] efi: refactor grub_efi_allocate_pages
bbc6a89
bbc6a89
Expose a new function, grub_efi_allocate_pages_real(), making it possible
bbc6a89
to specify allocation type and memory type as supported by the UEFI
bbc6a89
AllocatePages boot service.
bbc6a89
bbc6a89
Make grub_efi_allocate_pages() a consumer of the new function,
bbc6a89
maintaining its old functionality.
bbc6a89
bbc6a89
Also delete some left-around #if 1/#else blocks in the affected
bbc6a89
functions.
bbc6a89
bbc6a89
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
bbc6a89
---
bbc6a89
 grub-core/kern/efi/mm.c | 46 ++++++++++++++++++++++++----------------------
bbc6a89
 include/grub/efi/efi.h  |  5 +++++
bbc6a89
 2 files changed, 29 insertions(+), 22 deletions(-)
bbc6a89
bbc6a89
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
ec4acbb
index 20a47aaf5d0..d88bc5e4326 100644
bbc6a89
--- a/grub-core/kern/efi/mm.c
bbc6a89
+++ b/grub-core/kern/efi/mm.c
bbc6a89
@@ -51,36 +51,20 @@ int grub_efi_is_finished = 0;
bbc6a89
 
bbc6a89
 /* Allocate pages. Return the pointer to the first of allocated pages.  */
bbc6a89
 void *
bbc6a89
-grub_efi_allocate_pages (grub_efi_physical_address_t address,
bbc6a89
-			 grub_efi_uintn_t pages)
bbc6a89
+grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
bbc6a89
+			      grub_efi_uintn_t pages,
bbc6a89
+			      grub_efi_allocate_type_t alloctype,
bbc6a89
+			      grub_efi_memory_type_t memtype)
bbc6a89
 {
bbc6a89
-  grub_efi_allocate_type_t type;
bbc6a89
   grub_efi_status_t status;
bbc6a89
   grub_efi_boot_services_t *b;
bbc6a89
 
bbc6a89
-#if 1
bbc6a89
   /* Limit the memory access to less than 4GB for 32-bit platforms.  */
bbc6a89
   if (address > GRUB_EFI_MAX_USABLE_ADDRESS)
bbc6a89
     return 0;
bbc6a89
-#endif
bbc6a89
-
bbc6a89
-#if 1
bbc6a89
-  if (address == 0)
bbc6a89
-    {
bbc6a89
-      type = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
bbc6a89
-      address = GRUB_EFI_MAX_USABLE_ADDRESS;
bbc6a89
-    }
bbc6a89
-  else
bbc6a89
-    type = GRUB_EFI_ALLOCATE_ADDRESS;
bbc6a89
-#else
bbc6a89
-  if (address == 0)
bbc6a89
-    type = GRUB_EFI_ALLOCATE_ANY_PAGES;
bbc6a89
-  else
bbc6a89
-    type = GRUB_EFI_ALLOCATE_ADDRESS;
bbc6a89
-#endif
bbc6a89
 
bbc6a89
   b = grub_efi_system_table->boot_services;
bbc6a89
-  status = efi_call_4 (b->allocate_pages, type, GRUB_EFI_LOADER_DATA, pages, &address);
bbc6a89
+  status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
bbc6a89
   if (status != GRUB_EFI_SUCCESS)
bbc6a89
     return 0;
bbc6a89
 
bbc6a89
@@ -89,7 +73,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
bbc6a89
       /* Uggh, the address 0 was allocated... This is too annoying,
bbc6a89
 	 so reallocate another one.  */
bbc6a89
       address = GRUB_EFI_MAX_USABLE_ADDRESS;
bbc6a89
-      status = efi_call_4 (b->allocate_pages, type, GRUB_EFI_LOADER_DATA, pages, &address);
bbc6a89
+      status = efi_call_4 (b->allocate_pages, alloctype, memtype, pages, &address);
bbc6a89
       grub_efi_free_pages (0, pages);
bbc6a89
       if (status != GRUB_EFI_SUCCESS)
bbc6a89
 	return 0;
bbc6a89
@@ -98,6 +82,24 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
bbc6a89
   return (void *) ((grub_addr_t) address);
bbc6a89
 }
bbc6a89
 
bbc6a89
+void *
bbc6a89
+grub_efi_allocate_pages (grub_efi_physical_address_t address,
bbc6a89
+			 grub_efi_uintn_t pages)
bbc6a89
+{
bbc6a89
+  grub_efi_allocate_type_t alloctype;
bbc6a89
+
bbc6a89
+  if (address == 0)
bbc6a89
+    {
bbc6a89
+      alloctype = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
bbc6a89
+      address = GRUB_EFI_MAX_USABLE_ADDRESS;
bbc6a89
+    }
bbc6a89
+  else
bbc6a89
+    alloctype = GRUB_EFI_ALLOCATE_ADDRESS;
bbc6a89
+
bbc6a89
+  return grub_efi_allocate_pages_real (address, pages, alloctype,
bbc6a89
+				       GRUB_EFI_LOADER_DATA);
bbc6a89
+}
bbc6a89
+
bbc6a89
 /* Free pages starting from ADDRESS.  */
bbc6a89
 void
bbc6a89
 grub_efi_free_pages (grub_efi_physical_address_t address,
bbc6a89
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
ec4acbb
index e9c601f3410..b4cbebf3828 100644
bbc6a89
--- a/include/grub/efi/efi.h
bbc6a89
+++ b/include/grub/efi/efi.h
bbc6a89
@@ -38,6 +38,11 @@ void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,
bbc6a89
 int EXPORT_FUNC(grub_efi_set_text_mode) (int on);
bbc6a89
 void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);
bbc6a89
 void *
bbc6a89
+EXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,
bbc6a89
+				           grub_efi_uintn_t pages,
bbc6a89
+					   grub_efi_allocate_type_t alloctype,
bbc6a89
+					   grub_efi_memory_type_t memtype);
bbc6a89
+void *
bbc6a89
 EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
bbc6a89
 				      grub_efi_uintn_t pages);
bbc6a89
 void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
bbc6a89
-- 
63f1a98
2.14.3
bbc6a89