Load m1n1 at top of kernel data

m1n1 expects itself to be loaded below top of kernel data, so load it
right at top of kernel data and then update top of kernel so that it is
below top of kernel data.

In particular, its memory allocator start at topOfKernelData and assumes
all memory between that and physBase + memSize is free. More severely,
the chainloading scripts will derive new topOfKernelData from the
current m1n1, so the current approach of loading would actually cause
chainloading to set topOfKernelData to near the end of memory, causing
problems.m1n1 expects itself to be loaded below top of kernel data, so
do it.

Signed-off-by: Nick Chan <[email protected]>

Author: asdfugil

src/kernel/entry.c

@@ -284,6 +284,8 @@ __attribute__((noinline)) void pongo_entry_cached(void)
         screen_fill_basecolor();
 }
 
+extern uint64_t gM1N1Base;
+
 /*
 
     Name: pongo_entry
@@ -314,19 +316,20 @@ _Noreturn void pongo_entry(uint64_t *kernel_args, void *entryp, void (*exit_to_e
     void *boot_tramp = (void*)((gTopOfKernelData + 0x3fffULL) & ~0x3fffULL);
     if(gBootFlag == BOOT_FLAG_RAW || gBootFlag == BOOT_FLAG_M1N1)
     {
+        uint64_t entry;
         // We're in EL1 here, but we might need to go back to EL3
         if((__builtin_arm_rsr64("id_aa64pfr0_el1") & 0xf000) != 0)
         {
             __asm__ volatile("smc 0"); // elevate to EL3
         }
-        uint64_t entryOff = 0x800;
         if(gBootFlag == BOOT_FLAG_RAW)
         {
+            entry = (uint64_t)loader_xfer_recv_data - kCacheableView + 0x800000000;
             boot_tramp = NULL;
-            entryOff = 0;
+        } else {
+            entry = (uint64_t)gM1N1Base + 0x800;
         }
-        // XXX: We should really replace loader_xfer_recv_data with something dedicated here.
-        void *image = (void*)((uint64_t)loader_xfer_recv_data - kCacheableView + 0x800000000 + entryOff);
+        void *image = (void*)entry;
         jump_to_image_extended(image, gBootArgs, boot_tramp, gEntryPoint);
     }
     else

src/shell/main.c

@@ -46,17 +46,23 @@ void pongo_boot_raw(const char *cmd, char *args) {
     task_yield();
 }
 
+uint64_t gM1N1Base;
 extern char gFWVersion[256];
 void pongo_boot_m1n1(const char *cmd, char *args) {
     if (!loader_xfer_recv_count) {
         iprintf("please upload a raw m1n1.bin before issuing this command\n");
         return;
     }
 
-    loader_xfer_recv_count = 0;
     char *fwversion = dt_get_prop("/chosen", "firmware-version", NULL);
     strlcpy(fwversion, gFWVersion, 256);
 
+    gM1N1Base = (gBootArgs->topOfKernelData + 0x3fff) & ~0x3fff;
+    memmove((void*)(gM1N1Base - 0x800000000 + kCacheableView), loader_xfer_recv_data, loader_xfer_recv_count);
+    gBootArgs->topOfKernelData = (gM1N1Base + loader_xfer_recv_count + 0x3fff) & ~0x3fff;
+    gTopOfKernelData = gBootArgs->topOfKernelData;
+    loader_xfer_recv_count = 0;
+
     gBootFlag = BOOT_FLAG_M1N1;
     task_yield();
 }