common: Drop net.h from common header

[J-u-boot.git] / lib / efi_loader / efi_memory.c

diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 83cbc9154f3f47fc4f9cd478ad7630f551021a61..44b8a2e09f0a543ae112a131a797a4b14347ec74 100644 (file)
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -7,9 +7,11 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <init.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <watchdog.h>
+#include <asm/cache.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
 
@@ -228,7 +230,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map,
 }
 
 /**
- * efi_add_memory_map() - add memory area to the memory map
+ * efi_add_memory_map_pg() - add pages to the memory map
  *
  * @start:             start address, must be a multiple of EFI_PAGE_SIZE
  * @pages:             number of pages to add
@@ -236,8 +238,9 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map,
  * @overlap_only_ram:  the memory area must overlap existing
  * Return:             status code
  */
-efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
-                               bool overlap_only_ram)
+static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages,
+                                         int memory_type,
+                                         bool overlap_only_ram)
 {
        struct list_head *lhandle;
        struct efi_mem_list *newlist;
@@ -342,6 +345,28 @@ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
        return EFI_SUCCESS;
 }
 
+/**
+ * efi_add_memory_map() - add memory area to the memory map
+ *
+ * @start:             start address of the memory area
+ * @size:              length in bytes of the memory area
+ * @memory_type:       type of memory added
+ *
+ * Return:             status code
+ *
+ * This function automatically aligns the start and size of the memory area
+ * to EFI_PAGE_SIZE.
+ */
+efi_status_t efi_add_memory_map(u64 start, u64 size, int memory_type)
+{
+       u64 pages;
+
+       pages = efi_size_in_pages(size + (start & EFI_PAGE_MASK));
+       start &= ~EFI_PAGE_MASK;
+
+       return efi_add_memory_map_pg(start, pages, memory_type, false);
+}
+
 /**
  * efi_check_allocated() - validate address to be freed
  *
@@ -468,7 +493,8 @@ efi_status_t efi_allocate_pages(int type, int memory_type,
        }
 
        /* Reserve that map in our memory maps */
-       if (efi_add_memory_map(addr, pages, memory_type, true) != EFI_SUCCESS)
+       ret = efi_add_memory_map_pg(addr, pages, memory_type, true);
+       if (ret != EFI_SUCCESS)
                /* Map would overlap, bail out */
                return  EFI_OUT_OF_RESOURCES;
 
@@ -513,7 +539,8 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages)
                return EFI_INVALID_PARAMETER;
        }
 
-       ret = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false);
+       ret = efi_add_memory_map_pg(memory, pages, EFI_CONVENTIONAL_MEMORY,
+                                   false);
        /* Merging of adjacent free regions is missing */
 
        if (ret != EFI_SUCCESS)
@@ -626,18 +653,18 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
 
        *memory_map_size = map_size;
 
-       if (provided_map_size < map_size)
-               return EFI_BUFFER_TOO_SMALL;
-
-       if (!memory_map)
-               return EFI_INVALID_PARAMETER;
-
        if (descriptor_size)
                *descriptor_size = sizeof(struct efi_mem_desc);
 
        if (descriptor_version)
                *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION;
 
+       if (provided_map_size < map_size)
+               return EFI_BUFFER_TOO_SMALL;
+
+       if (!memory_map)
+               return EFI_INVALID_PARAMETER;
+
        /* Copy list into array */
        /* Return the list in ascending order */
        memory_map = &memory_map[map_entries - 1];
@@ -679,8 +706,8 @@ efi_status_t efi_add_conventional_memory_map(u64 ram_start, u64 ram_end,
 
        pages = (ram_end - ram_start) >> EFI_PAGE_SHIFT;
 
-       efi_add_memory_map(ram_start, pages,
-                          EFI_CONVENTIONAL_MEMORY, false);
+       efi_add_memory_map_pg(ram_start, pages,
+                             EFI_CONVENTIONAL_MEMORY, false);
 
        /*
         * Boards may indicate to the U-Boot memory core that they
@@ -690,14 +717,14 @@ efi_status_t efi_add_conventional_memory_map(u64 ram_start, u64 ram_end,
         */
        if (ram_top < ram_start) {
                /* ram_top is before this region, reserve all */
-               efi_add_memory_map(ram_start, pages,
-                                  EFI_BOOT_SERVICES_DATA, true);
+               efi_add_memory_map_pg(ram_start, pages,
+                                     EFI_BOOT_SERVICES_DATA, true);
        } else if ((ram_top >= ram_start) && (ram_top < ram_end)) {
                /* ram_top is inside this region, reserve parts */
                pages = (ram_end - ram_top) >> EFI_PAGE_SHIFT;
 
-               efi_add_memory_map(ram_top, pages,
-                                  EFI_BOOT_SERVICES_DATA, true);
+               efi_add_memory_map_pg(ram_top, pages,
+                                     EFI_BOOT_SERVICES_DATA, true);
        }
 
        return EFI_SUCCESS;
@@ -738,9 +765,12 @@ static void add_u_boot_and_runtime(void)
        unsigned long uboot_stack_size = 16 * 1024 * 1024;
 
        /* Add U-Boot */
-       uboot_start = (gd->start_addr_sp - uboot_stack_size) & ~EFI_PAGE_MASK;
-       uboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;
-       efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false);
+       uboot_start = ((uintptr_t)map_sysmem(gd->start_addr_sp, 0) -
+                      uboot_stack_size) & ~EFI_PAGE_MASK;
+       uboot_pages = ((uintptr_t)map_sysmem(gd->ram_top - 1, 0) -
+                      uboot_start + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
+       efi_add_memory_map_pg(uboot_start, uboot_pages, EFI_LOADER_DATA,
+                             false);
 
 #if defined(__aarch64__)
        /*
@@ -759,16 +789,15 @@ static void add_u_boot_and_runtime(void)
        runtime_end = (ulong)&__efi_runtime_stop;
        runtime_end = (runtime_end + runtime_mask) & ~runtime_mask;
        runtime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT;
-       efi_add_memory_map(runtime_start, runtime_pages,
-                          EFI_RUNTIME_SERVICES_CODE, false);
+       efi_add_memory_map_pg(runtime_start, runtime_pages,
+                             EFI_RUNTIME_SERVICES_CODE, false);
 }
 
 int efi_memory_init(void)
 {
        efi_add_known_memory();
 
-       if (!IS_ENABLED(CONFIG_SANDBOX))
-               add_u_boot_and_runtime();
+       add_u_boot_and_runtime();
 
 #ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
        /* Request a 32bit 64MB bounce buffer region */