Merge tag 'ti-v2021.10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-ti

[u-boot.git] / cmd / efi.c

diff --git a/cmd/efi.c b/cmd/efi.c
index 2511c6cb78a0f188572071ced1b323832ccec5d9..f2ed26bd4b23b1fcf1f946534a6aff33781f4a9d 100644 (file)
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -8,7 +8,10 @@
 #include <command.h>
 #include <efi.h>
 #include <errno.h>
+#include <log.h>
 #include <malloc.h>
+#include <sort.h>
+#include <asm/global_data.h>
 
 static const char *const type_name[] = {
        "reserved",
@@ -28,18 +31,22 @@ static const char *const type_name[] = {
 };
 
 static struct attr_info {
-       int shift;
+       u64 val;
        const char *name;
 } mem_attr[] = {
-       { EFI_MEMORY_UC_SHIFT, "uncached" },
-       { EFI_MEMORY_WC_SHIFT, "write-coalescing" },
-       { EFI_MEMORY_WT_SHIFT, "write-through" },
-       { EFI_MEMORY_WB_SHIFT, "write-back" },
-       { EFI_MEMORY_UCE_SHIFT, "uncached & exported" },
-       { EFI_MEMORY_WP_SHIFT, "write-protect" },
-       { EFI_MEMORY_RP_SHIFT, "read-protect" },
-       { EFI_MEMORY_XP_SHIFT, "execute-protect" },
-       { EFI_MEMORY_RUNTIME_SHIFT, "needs runtime mapping" }
+       { EFI_MEMORY_UC, "uncached" },
+       { EFI_MEMORY_WC, "write-coalescing" },
+       { EFI_MEMORY_WT, "write-through" },
+       { EFI_MEMORY_WB, "write-back" },
+       { EFI_MEMORY_UCE, "uncached & exported" },
+       { EFI_MEMORY_WP, "write-protect" },
+       { EFI_MEMORY_RP, "read-protect" },
+       { EFI_MEMORY_XP, "execute-protect" },
+       { EFI_MEMORY_NV, "non-volatile" },
+       { EFI_MEMORY_MORE_RELIABLE, "higher reliability" },
+       { EFI_MEMORY_RO, "read-only" },
+       { EFI_MEMORY_SP, "specific purpose" },
+       { EFI_MEMORY_RUNTIME, "needs runtime mapping" }
 };
 
 /* Maximum different attribute values we can track */
@@ -65,7 +72,19 @@ static int h_cmp_entry(const void *v1, const void *v2)
        return diff < 0 ? -1 : diff > 0 ? 1 : 0;
 }
 
-void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs)
+/**
+ * efi_build_mem_table() - make a sorted copy of the memory table
+ *
+ * @map:       Pointer to EFI memory map table
+ * @size:      Size of table in bytes
+ * @skip_bs:   True to skip boot-time memory and merge it with conventional
+ *             memory. This will significantly reduce the number of table
+ *             entries.
+ * Return:     pointer to the new table. It should be freed with free() by the
+ *             caller.
+ */
+static void *efi_build_mem_table(struct efi_entry_memmap *map, int size,
+                                bool skip_bs)
 {
        struct efi_mem_desc *desc, *end, *base, *dest, *prev;
        int count;
@@ -83,10 +102,16 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs)
        prev = NULL;
        addr = 0;
        dest = base;
-       end = base + count;
+       end = (struct efi_mem_desc *)((ulong)base + count * map->desc_size);
        for (desc = base; desc < end; desc = efi_get_next_mem_desc(map, desc)) {
                bool merge = true;
-               int type = desc->type;
+               u32 type = desc->type;
+
+               if (type >= EFI_MAX_MEMORY_TYPE) {
+                       printf("Memory map contains invalid entry type %u\n",
+                              type);
+                       continue;
+               }
 
                if (skip_bs && is_boot_services(desc->type))
                        type = EFI_CONVENTIONAL_MEMORY;
@@ -113,7 +138,7 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs)
        }
 
        /* Mark the end */
-       dest->type = EFI_TABLE_END;
+       dest->type = EFI_MAX_MEMORY_TYPE;
 
        return base;
 }
@@ -132,7 +157,7 @@ static void efi_print_mem_table(struct efi_entry_memmap *map,
        /* Keep track of all the different attributes we have seen */
        attr_seen_count = 0;
        addr = 0;
-       for (upto = 0; desc->type != EFI_TABLE_END;
+       for (upto = 0; desc->type != EFI_MAX_MEMORY_TYPE;
             upto++, desc = efi_get_next_mem_desc(map, desc)) {
                const char *name;
                u64 size;
@@ -170,10 +195,10 @@ static void efi_print_mem_table(struct efi_entry_memmap *map,
                bool first;
                int j;
 
-               printf("%c%llx: ", attr & EFI_MEMORY_RUNTIME ? 'r' : ' ',
+               printf("%c%llx: ", (attr & EFI_MEMORY_RUNTIME) ? 'r' : ' ',
                       attr & ~EFI_MEMORY_RUNTIME);
                for (j = 0, first = true; j < ARRAY_SIZE(mem_attr); j++) {
-                       if (attr & (1ULL << mem_attr[j].shift)) {
+                       if (attr & mem_attr[j].val) {
                                if (first)
                                        first = false;
                                else
@@ -187,7 +212,8 @@ static void efi_print_mem_table(struct efi_entry_memmap *map,
                printf("*Some areas are merged (use 'all' to see)\n");
 }
 
-static int do_efi_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_efi_mem(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        struct efi_mem_desc *desc;
        struct efi_entry_memmap *map;
@@ -227,13 +253,13 @@ done:
        return ret ? CMD_RET_FAILURE : 0;
 }
 
-static cmd_tbl_t efi_commands[] = {
+static struct cmd_tbl efi_commands[] = {
        U_BOOT_CMD_MKENT(mem, 1, 1, do_efi_mem, "", ""),
 };
 
-static int do_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_efi(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       cmd_tbl_t *efi_cmd;
+       struct cmd_tbl *efi_cmd;
        int ret;
 
        if (argc < 2)