Merge branch 'master' of git://git.denx.de/u-boot-spi

[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 967c3f733e4c581e2e0adc13c7507d6cf74c71f5..776077cc35aa2f22fc55171127f7ba9bcf4d747d 100644 (file)
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -7,14 +7,17 @@
 
 #include <common.h>
 #include <efi_loader.h>
 
 #include <common.h>
 #include <efi_loader.h>

-#include <inttypes.h>

 #include <malloc.h>
 #include <mapmem.h>
 #include <watchdog.h>
 #include <linux/list_sort.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <watchdog.h>
 #include <linux/list_sort.h>

+#include <linux/sizes.h>

 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 

+/* Magic number identifying memory allocated from pool */
+#define EFI_ALLOC_POOL_MAGIC 0x1fe67ddf6491caa2
+

 efi_uintn_t efi_memory_map_key;
 
 struct efi_mem_list {
 efi_uintn_t efi_memory_map_key;
 
 struct efi_mem_list {


@@ -33,7 +36,12 @@ LIST_HEAD(efi_mem);
 void *efi_bounce_buffer;
 #endif
 
 void *efi_bounce_buffer;
 #endif
 

-/*
+/**
+ * efi_pool_allocation - memory block allocated from pool
+ *
+ * @num_pages: number of pages allocated
+ * @checksum:  checksum
+ *

  * U-Boot services each EFI AllocatePool request as a separate
  * (multiple) page allocation.  We have to track the number of pages
  * to be able to free the correct amount later.
  * U-Boot services each EFI AllocatePool request as a separate
  * (multiple) page allocation.  We have to track the number of pages
  * to be able to free the correct amount later.


@@ -43,9 +51,26 @@ void *efi_bounce_buffer;
  */
 struct efi_pool_allocation {
        u64 num_pages;
  */
 struct efi_pool_allocation {
        u64 num_pages;

+       u64 checksum;

        char data[] __aligned(ARCH_DMA_MINALIGN);
 };
 
        char data[] __aligned(ARCH_DMA_MINALIGN);
 };
 

+/**
+ * checksum() - calculate checksum for memory allocated from pool
+ *
+ * @alloc:     allocation header
+ * Return:     checksum, always non-zero
+ */
+static u64 checksum(struct efi_pool_allocation *alloc)
+{
+       u64 addr = (uintptr_t)alloc;
+       u64 ret = (addr >> 32) ^ (addr << 32) ^ alloc->num_pages ^
+                 EFI_ALLOC_POOL_MAGIC;
+       if (!ret)
+               ++ret;
+       return ret;
+}
+

 /*
  * Sorts the memory list from highest address to lowest address
  *
 /*
  * Sorts the memory list from highest address to lowest address
  *


@@ -66,9 +91,54 @@ static int efi_mem_cmp(void *priv, struct list_head *a, struct list_head *b)
                return -1;
 }
 
                return -1;
 }
 

+static uint64_t desc_get_end(struct efi_mem_desc *desc)
+{
+       return desc->physical_start + (desc->num_pages << EFI_PAGE_SHIFT);
+}
+

 static void efi_mem_sort(void)
 {
 static void efi_mem_sort(void)
 {

+       struct list_head *lhandle;
+       struct efi_mem_list *prevmem = NULL;
+       bool merge_again = true;
+

        list_sort(NULL, &efi_mem, efi_mem_cmp);
        list_sort(NULL, &efi_mem, efi_mem_cmp);

+
+       /* Now merge entries that can be merged */
+       while (merge_again) {
+               merge_again = false;
+               list_for_each(lhandle, &efi_mem) {
+                       struct efi_mem_list *lmem;
+                       struct efi_mem_desc *prev = &prevmem->desc;
+                       struct efi_mem_desc *cur;
+                       uint64_t pages;
+
+                       lmem = list_entry(lhandle, struct efi_mem_list, link);
+                       if (!prevmem) {
+                               prevmem = lmem;
+                               continue;
+                       }
+
+                       cur = &lmem->desc;
+
+                       if ((desc_get_end(cur) == prev->physical_start) &&
+                           (prev->type == cur->type) &&
+                           (prev->attribute == cur->attribute)) {
+                               /* There is an existing map before, reuse it */
+                               pages = cur->num_pages;
+                               prev->num_pages += pages;
+                               prev->physical_start -= pages << EFI_PAGE_SHIFT;
+                               prev->virtual_start -= pages << EFI_PAGE_SHIFT;
+                               list_del(&lmem->link);
+                               free(lmem);
+
+                               merge_again = true;
+                               break;
+                       }
+
+                       prevmem = lmem;
+               }
+       }

 }
 
 /** efi_mem_carve_out - unmap memory region
 }
 
 /** efi_mem_carve_out - unmap memory region


@@ -123,6 +193,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map,
                        free(map);
                } else {
                        map->desc.physical_start = carve_end;
                        free(map);
                } else {
                        map->desc.physical_start = carve_end;

+                       map->desc.virtual_start = carve_end;

                        map->desc.num_pages = (map_end - carve_end)
                                              >> EFI_PAGE_SHIFT;
                }
                        map->desc.num_pages = (map_end - carve_end)
                                              >> EFI_PAGE_SHIFT;
                }


@@ -141,6 +212,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map,
        newmap = calloc(1, sizeof(*newmap));
        newmap->desc = map->desc;
        newmap->desc.physical_start = carve_start;
        newmap = calloc(1, sizeof(*newmap));
        newmap->desc = map->desc;
        newmap->desc.physical_start = carve_start;

+       newmap->desc.virtual_start = carve_start;

        newmap->desc.num_pages = (map_end - carve_start) >> EFI_PAGE_SHIFT;
        /* Insert before current entry (descending address order) */
        list_add_tail(&newmap->link, &map->link);
        newmap->desc.num_pages = (map_end - carve_start) >> EFI_PAGE_SHIFT;
        /* Insert before current entry (descending address order) */
        list_add_tail(&newmap->link, &map->link);


@@ -159,8 +231,8 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
        bool carve_again;
        uint64_t carved_pages = 0;
 
        bool carve_again;
        uint64_t carved_pages = 0;
 

-       debug("%s: 0x%" PRIx64 " 0x%" PRIx64 " %d %s\n", __func__,
-             start, pages, memory_type, overlap_only_ram ? "yes" : "no");
+       EFI_PRINT("%s: 0x%llx 0x%llx %d %s\n", __func__,
+                 start, pages, memory_type, overlap_only_ram ? "yes" : "no");

 
        if (memory_type >= EFI_MAX_MEMORY_TYPE)
                return EFI_INVALID_PARAMETER;
 
        if (memory_type >= EFI_MAX_MEMORY_TYPE)
                return EFI_INVALID_PARAMETER;


@@ -178,14 +250,13 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
        switch (memory_type) {
        case EFI_RUNTIME_SERVICES_CODE:
        case EFI_RUNTIME_SERVICES_DATA:
        switch (memory_type) {
        case EFI_RUNTIME_SERVICES_CODE:
        case EFI_RUNTIME_SERVICES_DATA:

-               newlist->desc.attribute = (1 << EFI_MEMORY_WB_SHIFT) |
-                                         (1ULL << EFI_MEMORY_RUNTIME_SHIFT);
+               newlist->desc.attribute = EFI_MEMORY_WB | EFI_MEMORY_RUNTIME;

                break;
        case EFI_MMAP_IO:
                break;
        case EFI_MMAP_IO:

-               newlist->desc.attribute = 1ULL << EFI_MEMORY_RUNTIME_SHIFT;
+               newlist->desc.attribute = EFI_MEMORY_RUNTIME;

                break;
        default:
                break;
        default:

-               newlist->desc.attribute = 1 << EFI_MEMORY_WB_SHIFT;
+               newlist->desc.attribute = EFI_MEMORY_WB;

                break;
        }
 
                break;
        }
 


@@ -251,6 +322,12 @@ static uint64_t efi_find_free_memory(uint64_t len, uint64_t max_addr)
 {
        struct list_head *lhandle;
 
 {
        struct list_head *lhandle;
 

+       /*
+        * Prealign input max address, so we simplify our matching
+        * logic below and can just reuse it as return pointer.
+        */
+       max_addr &= ~EFI_PAGE_MASK;
+

        list_for_each(lhandle, &efi_mem) {
                struct efi_mem_list *lmem = list_entry(lhandle,
                        struct efi_mem_list, link);
        list_for_each(lhandle, &efi_mem) {
                struct efi_mem_list *lmem = list_entry(lhandle,
                        struct efi_mem_list, link);


@@ -299,6 +376,10 @@ efi_status_t efi_allocate_pages(int type, int memory_type,
        efi_status_t r = EFI_SUCCESS;
        uint64_t addr;
 
        efi_status_t r = EFI_SUCCESS;
        uint64_t addr;
 

+       /* Check import parameters */
+       if (memory_type >= EFI_PERSISTENT_MEMORY_TYPE &&
+           memory_type <= 0x6FFFFFFF)
+               return EFI_INVALID_PARAMETER;

        if (!memory)
                return EFI_INVALID_PARAMETER;
 
        if (!memory)
                return EFI_INVALID_PARAMETER;
 


@@ -335,7 +416,7 @@ efi_status_t efi_allocate_pages(int type, int memory_type,
                /* Reserve that map in our memory maps */
                ret = efi_add_memory_map(addr, pages, memory_type, true);
                if (ret == addr) {
                /* Reserve that map in our memory maps */
                ret = efi_add_memory_map(addr, pages, memory_type, true);
                if (ret == addr) {

-                       *memory = (uintptr_t)map_sysmem(addr, len);
+                       *memory = addr;

                } else {
                        /* Map would overlap, bail out */
                        r = EFI_OUT_OF_RESOURCES;
                } else {
                        /* Map would overlap, bail out */
                        r = EFI_OUT_OF_RESOURCES;


@@ -348,7 +429,7 @@ efi_status_t efi_allocate_pages(int type, int memory_type,
 void *efi_alloc(uint64_t len, int memory_type)
 {
        uint64_t ret = 0;
 void *efi_alloc(uint64_t len, int memory_type)
 {
        uint64_t ret = 0;

-       uint64_t pages = (len + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
+       uint64_t pages = efi_size_in_pages(len);

        efi_status_t r;
 
        r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, memory_type, pages,
        efi_status_t r;
 
        r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, memory_type, pages,


@@ -359,41 +440,48 @@ void *efi_alloc(uint64_t len, int memory_type)
        return NULL;
 }
 
        return NULL;
 }
 

-/*
- * Free memory pages.
+/**
+ * efi_free_pages() - free memory pages

  *
  *

- * @memory     start of the memory area to be freed
- * @pages      number of pages to be freed
- * @return     status code
+ * @memory:    start of the memory area to be freed
+ * @pages:     number of pages to be freed
+ * Return:     status code

  */
 efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages)
 {
        uint64_t r = 0;
  */
 efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages)
 {
        uint64_t r = 0;

-       uint64_t addr = map_to_sysmem((void *)(uintptr_t)memory);

 
 

-       r = efi_add_memory_map(addr, pages, EFI_CONVENTIONAL_MEMORY, false);
+       /* Sanity check */
+       if (!memory || (memory & EFI_PAGE_MASK) || !pages) {
+               printf("%s: illegal free 0x%llx, 0x%zx\n", __func__,
+                      memory, pages);
+               return EFI_INVALID_PARAMETER;
+       }
+
+       r = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false);

        /* Merging of adjacent free regions is missing */
 
        /* Merging of adjacent free regions is missing */
 

-       if (r == addr)
+       if (r == memory)

                return EFI_SUCCESS;
 
        return EFI_NOT_FOUND;
 }
 
                return EFI_SUCCESS;
 
        return EFI_NOT_FOUND;
 }
 

-/*
- * Allocate memory from pool.
+/**
+ * efi_allocate_pool - allocate memory from pool

  *
  *

- * @pool_type  type of the pool from which memory is to be allocated
- * @size       number of bytes to be allocated
- * @buffer     allocated memory
- * @return     status code
+ * @pool_type: type of the pool from which memory is to be allocated
+ * @size:      number of bytes to be allocated
+ * @buffer:    allocated memory
+ * Return:     status code

  */
 efi_status_t efi_allocate_pool(int pool_type, efi_uintn_t size, void **buffer)
 {
        efi_status_t r;
  */
 efi_status_t efi_allocate_pool(int pool_type, efi_uintn_t size, void **buffer)
 {
        efi_status_t r;

+       u64 addr;

        struct efi_pool_allocation *alloc;
        struct efi_pool_allocation *alloc;

-       u64 num_pages = (size + sizeof(struct efi_pool_allocation) +
-                        EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
+       u64 num_pages = efi_size_in_pages(size +
+                                         sizeof(struct efi_pool_allocation));

 
        if (!buffer)
                return EFI_INVALID_PARAMETER;
 
        if (!buffer)
                return EFI_INVALID_PARAMETER;


@@ -404,21 +492,22 @@ efi_status_t efi_allocate_pool(int pool_type, efi_uintn_t size, void **buffer)
        }
 
        r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, pool_type, num_pages,
        }
 
        r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, pool_type, num_pages,

-                              (uint64_t *)&alloc);
-
+                              &addr);

        if (r == EFI_SUCCESS) {
        if (r == EFI_SUCCESS) {

+               alloc = (struct efi_pool_allocation *)(uintptr_t)addr;

                alloc->num_pages = num_pages;
                alloc->num_pages = num_pages;

+               alloc->checksum = checksum(alloc);

                *buffer = alloc->data;
        }
 
        return r;
 }
 
                *buffer = alloc->data;
        }
 
        return r;
 }
 

-/*
- * Free memory from pool.
+/**
+ * efi_free_pool() - free memory from pool

  *
  *

- * @buffer     start of memory to be freed
- * @return     status code
+ * @buffer:    start of memory to be freed
+ * Return:     status code

  */
 efi_status_t efi_free_pool(void *buffer)
 {
  */
 efi_status_t efi_free_pool(void *buffer)
 {


@@ -429,8 +518,15 @@ efi_status_t efi_free_pool(void *buffer)
                return EFI_INVALID_PARAMETER;
 
        alloc = container_of(buffer, struct efi_pool_allocation, data);
                return EFI_INVALID_PARAMETER;
 
        alloc = container_of(buffer, struct efi_pool_allocation, data);

-       /* Sanity check, was the supplied address returned by allocate_pool */
-       assert(((uintptr_t)alloc & EFI_PAGE_MASK) == 0);
+
+       /* Check that this memory was allocated by efi_allocate_pool() */
+       if (((uintptr_t)alloc & EFI_PAGE_MASK) ||
+           alloc->checksum != checksum(alloc)) {
+               printf("%s: illegal free 0x%p\n", __func__, buffer);
+               return EFI_INVALID_PARAMETER;
+       }
+       /* Avoid double free */
+       alloc->checksum = 0;

 
        r = efi_free_pages((uintptr_t)alloc, alloc->num_pages);
 
 
        r = efi_free_pages((uintptr_t)alloc, alloc->num_pages);
 


@@ -457,11 +553,13 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
        efi_uintn_t map_size = 0;
        int map_entries = 0;
        struct list_head *lhandle;
        efi_uintn_t map_size = 0;
        int map_entries = 0;
        struct list_head *lhandle;

-       efi_uintn_t provided_map_size = *memory_map_size;
+       efi_uintn_t provided_map_size;

 
        if (!memory_map_size)
                return EFI_INVALID_PARAMETER;
 
 
        if (!memory_map_size)
                return EFI_INVALID_PARAMETER;
 

+       provided_map_size = *memory_map_size;
+

        list_for_each(lhandle, &efi_mem)
                map_entries++;
 
        list_for_each(lhandle, &efi_mem)
                map_entries++;
 


@@ -500,17 +598,57 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
 
 __weak void efi_add_known_memory(void)
 {
 
 __weak void efi_add_known_memory(void)
 {

+       u64 ram_top = board_get_usable_ram_top(0) & ~EFI_PAGE_MASK;

        int i;
 
        int i;
 

+       /*
+        * ram_top is just outside mapped memory. So use an offset of one for
+        * mapping the sandbox address.
+        */
+       ram_top = (uintptr_t)map_sysmem(ram_top - 1, 0) + 1;
+
+       /* Fix for 32bit targets with ram_top at 4G */
+       if (!ram_top)
+               ram_top = 0x100000000ULL;
+

        /* Add RAM */
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
        /* Add RAM */
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {

-               u64 ram_start = gd->bd->bi_dram[i].start;
-               u64 ram_size = gd->bd->bi_dram[i].size;
-               u64 start = (ram_start + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;
-               u64 pages = (ram_size + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
+               u64 ram_end, ram_start, pages;
+
+               ram_start = (uintptr_t)map_sysmem(gd->bd->bi_dram[i].start, 0);
+               ram_end = ram_start + gd->bd->bi_dram[i].size;

 
 

-               efi_add_memory_map(start, pages, EFI_CONVENTIONAL_MEMORY,
-                                  false);
+               /* Remove partial pages */
+               ram_end &= ~EFI_PAGE_MASK;
+               ram_start = (ram_start + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;
+
+               if (ram_end <= ram_start) {
+                       /* Invalid mapping, keep going. */
+                       continue;
+               }
+
+               pages = (ram_end - ram_start) >> EFI_PAGE_SHIFT;
+
+               efi_add_memory_map(ram_start, pages,
+                                  EFI_CONVENTIONAL_MEMORY, false);
+
+               /*
+                * Boards may indicate to the U-Boot memory core that they
+                * can not support memory above ram_top. Let's honor this
+                * in the efi_loader subsystem too by declaring any memory
+                * above ram_top as "already occupied by firmware".
+                */
+               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);
+               } 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);
+               }

        }
 }
 
        }
 }
 


@@ -518,6 +656,7 @@ __weak void efi_add_known_memory(void)
 static void add_u_boot_and_runtime(void)
 {
        unsigned long runtime_start, runtime_end, runtime_pages;
 static void add_u_boot_and_runtime(void)
 {
        unsigned long runtime_start, runtime_end, runtime_pages;

+       unsigned long runtime_mask = EFI_PAGE_MASK;

        unsigned long uboot_start, uboot_pages;
        unsigned long uboot_stack_size = 16 * 1024 * 1024;
 
        unsigned long uboot_start, uboot_pages;
        unsigned long uboot_stack_size = 16 * 1024 * 1024;
 


@@ -526,10 +665,22 @@ static void add_u_boot_and_runtime(void)
        uboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;
        efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false);
 
        uboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;
        efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false);
 

-       /* Add Runtime Services */
-       runtime_start = (ulong)&__efi_runtime_start & ~EFI_PAGE_MASK;
+#if defined(__aarch64__)
+       /*
+        * Runtime Services must be 64KiB aligned according to the
+        * "AArch64 Platforms" section in the UEFI spec (2.7+).
+        */
+
+       runtime_mask = SZ_64K - 1;
+#endif
+
+       /*
+        * Add Runtime Services. We mark surrounding boottime code as runtime as
+        * well to fulfill the runtime alignment constraints but avoid padding.
+        */
+       runtime_start = (ulong)&__efi_runtime_start & ~runtime_mask;

        runtime_end = (ulong)&__efi_runtime_stop;
        runtime_end = (ulong)&__efi_runtime_stop;

-       runtime_end = (runtime_end + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;
+       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);
        runtime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT;
        efi_add_memory_map(runtime_start, runtime_pages,
                           EFI_RUNTIME_SERVICES_CODE, false);