feat(mem): add image and data addresses global variables

These variables must be initialized in the boot.S of each arch.
Both are global variables, therefore we removed the passing as
argument of the load address throughout the internal APIs of
Bao.

Signed-off-by: Daniel Oliveira <[email protected]>

Author: danielRep

src/arch/armv8/aarch32/boot.S

@@ -54,6 +54,8 @@ _reset_handler:
      * Get base image load address.
      */
     adr r1, _el2_entry
+    ldr r3, =img_addr
+    str r1, [r3] // store image load address in img_addr
 
     /**
      * Linearize cpu id according to the number of clusters and processors per cluster. We are only
@@ -227,4 +229,3 @@ set_loop:
     cmp r5, r3 // last way reached yet?
     ble way_loop // if not, iterate way_loop
     bx lr
-

src/arch/armv8/aarch64/boot.S

@@ -48,6 +48,9 @@ _reset_handler:
 	mrs  x0, MPIDR_EL1
 	adrp x1, _image_start
 
+	ldr x2, =img_addr
+    str x1, [x2] // store image load address in img_addr
+
 	/*
 	 * Install vector table physical address early, in case exception occurs during this
 	 * initialization.
@@ -221,4 +224,3 @@ set_loop:
 	cmp x5, x3 // last way reached yet?
 	ble way_loop // if not, iterate way_loop
 	ret
-

src/arch/riscv/boot.S

@@ -97,6 +97,10 @@ _reset_handler:
 
     mv      a2, a1
     la      a1, _image_start
+
+    LD_SYM  a3, img_addr
+    STORE   a1, 0(a3) // store image load address in img_addr
+
     LD_SYM  s6, _extra_allocated_phys_mem_sym
 
     /**

src/core/config.c

@@ -5,23 +5,20 @@
 
 #include <config.h>
 
-static void config_adjust_vm_image_addr(paddr_t load_addr)
+static void config_adjust_vm_image_addr(void)
 {
     for (size_t i = 0; i < config.vmlist_size; i++) {
         struct vm_config* vm_config = &config.vmlist[i];
         if (!vm_config->image.separately_loaded) {
-            vm_config->image.load_addr = (vm_config->image.load_addr - BAO_VAS_BASE) + load_addr;
+            vm_config->image.load_addr = (vm_config->image.load_addr - BAO_VAS_BASE) + img_addr;
         }
     }
 }
 
-__attribute__((weak)) void config_mem_prot_init(paddr_t load_addr)
-{
-    UNUSED_ARG(load_addr);
-}
+__attribute__((weak)) void config_mem_prot_init(void) { }
 
-void config_init(paddr_t load_addr)
+void config_init(void)
 {
-    config_adjust_vm_image_addr(load_addr);
-    config_mem_prot_init(load_addr);
+    config_adjust_vm_image_addr();
+    config_mem_prot_init();
 }

src/core/cpu.c

@@ -31,13 +31,13 @@ static size_t ipi_cpumsg_handler_num;
 
 struct cpuif cpu_interfaces[PLAT_CPU_NUM];
 
-void cpu_init(cpuid_t cpu_id, paddr_t load_addr)
+void cpu_init(cpuid_t cpu_id)
 {
     cpu()->id = cpu_id;
     cpu()->handling_msgs = false;
     cpu()->interface = cpu_if(cpu()->id);
 
-    cpu_arch_init(cpu_id, load_addr);
+    cpu_arch_init(cpu_id, img_addr);
 
     list_init(&cpu()->interface->event_list);
 

src/core/inc/bao.h

@@ -22,7 +22,7 @@
     console_printk("BAO ERROR: " __VA_ARGS__); \
     while (true) { };
 
-void init(cpuid_t cpu_id, paddr_t load_addr);
+void init(cpuid_t cpu_id);
 
 #endif /* __ASSEMBLER__ */
 

src/core/inc/config.h

@@ -135,7 +135,7 @@ extern struct config {
 
 } config;
 
-void config_init(paddr_t load_addr);
-void config_mem_prot_init(paddr_t load_addr);
+void config_init(void);
+void config_mem_prot_init(void);
 
 #endif /* __CONFIG_H__ */

src/core/inc/cpu.h

@@ -62,7 +62,7 @@ struct cpu_synctoken {
 
 extern struct cpu_synctoken cpu_glb_sync;
 
-void cpu_init(cpuid_t cpu_id, paddr_t load_addr);
+void cpu_init(cpuid_t cpu_id);
 void cpu_send_msg(cpuid_t cpu, struct cpu_msg* msg);
 bool cpu_get_msg(struct cpu_msg* msg);
 void cpu_msg_handler(void);

src/core/inc/mem.h

@@ -67,7 +67,7 @@ static inline bool all_clrs(colormap_t clrs)
     return (masked_colors == 0) || (masked_colors == mask);
 }
 
-void mem_init(paddr_t load_addr);
+void mem_init(void);
 void* mem_alloc_page(size_t num_pages, enum AS_SEC sec, bool phys_aligned);
 struct ppages mem_alloc_ppages(colormap_t colors, size_t num_pages, bool aligned);
 vaddr_t mem_alloc_map(struct addr_space* as, enum AS_SEC section, struct ppages* page, vaddr_t at,
@@ -95,6 +95,11 @@ bool mem_translate(struct addr_space* as, vaddr_t va, paddr_t* pa);
 
 extern struct list page_pool_list;
 
-#endif /* |__ASSEMBLER__ */
+/* The address where the Bao image is loaded in memory */
+extern vaddr_t img_addr;
+/* The address where the data section is loaded in memory */
+extern vaddr_t data_addr;
+
+#endif /* __ASSEMBLER__ */
 
 #endif /* __MEM_H__ */

src/core/init.c

@@ -13,14 +13,14 @@
 #include <platform.h>
 #include <vmm.h>
 
-void init(cpuid_t cpu_id, paddr_t load_addr)
+void init(cpuid_t cpu_id)
 {
     /**
      * These initializations must be executed first and in fixed order.
      */
 
-    cpu_init(cpu_id, load_addr);
-    mem_init(load_addr);
+    cpu_init(cpu_id);
+    mem_init();
 
     /* -------------------------------------------------------------- */