Changes in boot/arch/arm64/src/main.c [b169619:28a5ebd] in mainline

File:

• boot/arch/arm64/src/main.c (modified) (7 diffs)

boot/arch/arm64/src/main.c

@@ -46 +46 @@
 #include <kernel.h>
 #include <macros.h>
-#include <mem.h>
+#include <memstr.h>
 #include <payload.h>
 #include <printf.h>
@@ -116 +116 @@
 {
         efi_status_t status;
+        uint64_t current_el;
         uint64_t memmap = 0;
         sysarg_t memmap_size;
@@ -142 +143 @@
         printf(" %p|%p: UEFI system table\n", efi_system_table_in,
             efi_system_table_in);
+
+        /* Validate the exception level. */
+        current_el = CurrentEL_read();
+        if (current_el != CURRENT_EL_EL1) {
+                printf("Error: Unexpected CurrentEL value %0#18" PRIx64 ".\n",
+                    current_el);
+                status = EFI_UNSUPPORTED;
+                goto fail;
+        }
 
         /* Obtain memory map. */
@@ -177 +187 @@
 
         /*
-         * Check that everything is aligned on a 4 KiB boundary and the kernel can
+         * Check that everything is aligned on a 4kB boundary and the kernel can
          * be placed by the decompression code at a correct address.
          */
@@ -189 +199 @@
          * Dynamically check the memory base. The condition should be always
          * true because UEFI guarantees each physical/virtual address in the
-         * memory map is aligned on a 4 KiB boundary.
+         * memory map is aligned on a 4kB boundary.
          */
         if (!IS_ALIGNED(memory_base, PAGE_SIZE)) {
                 printf("Error: Start of usable RAM (%p) is not aligned on a "
-                    "4 KiB boundary.\n", (void *) memory_base);
+                    "4kB boundary.\n", (void *) memory_base);
                 status = EFI_UNSUPPORTED;
                 goto fail;
@@ -233 +243 @@
 
         extract_payload(&bootinfo->taskmap, kernel_dest, ram_end,
-            (uintptr_t) kernel_dest, smc_coherence);
+            (uintptr_t) kernel_dest, ensure_visibility);
 
         /* Get final memory map. */
@@ -291 +301 @@
         bootinfo->memmap.cnt = cnt;
 
-        /* Flush the data cache containing bootinfo. */
-        dcache_flush(bootinfo, sizeof(*bootinfo));
-
         uintptr_t entry = check_kernel_translated((void *) decompress_base,
             BOOT_OFFSET);