Changeset 8a9a41e in mainline for boot/arch/arm64/src/main.c

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

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

boot/arch/arm64/src/main.c

@@ -116 +116 @@
 {
         efi_status_t status;
-        uint64_t current_el;
         uint64_t memmap = 0;
         sysarg_t memmap_size;
@@ -143 +142 @@
         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. */
@@ -187 +177 @@
 
         /*
-         * Check that everything is aligned on a 4kB boundary and the kernel can
+         * Check that everything is aligned on a 4 KiB boundary and the kernel can
          * be placed by the decompression code at a correct address.
          */
@@ -199 +189 @@
          * 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 4kB boundary.
+         * memory map is aligned on a 4 KiB boundary.
          */
         if (!IS_ALIGNED(memory_base, PAGE_SIZE)) {
                 printf("Error: Start of usable RAM (%p) is not aligned on a "
-                    "4kB boundary.\n", (void *) memory_base);
+                    "4 KiB boundary.\n", (void *) memory_base);
                 status = EFI_UNSUPPORTED;
                 goto fail;
@@ -243 +233 @@
 
         extract_payload(&bootinfo->taskmap, kernel_dest, ram_end,
-            (uintptr_t) kernel_dest, ensure_visibility);
+            (uintptr_t) kernel_dest, smc_coherence);
 
         /* Get final memory map. */
@@ -301 +291 @@
         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);