vm_arm: inline init_ram module

- inline code from the module to simplify VMM.
- define a weak function vm_init_ram() instead.
- improve comments.

Signed-off-by: Axel Heider <axel.heider@hensoldt.net>

Author: Axel Heider

arm_vm_helpers.cmake

@@ -47,7 +47,6 @@ function(DeclareCAmkESARMVM init_component)
         ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/fdt_manipulation.c
         ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/crossvm.c
         ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/map_frame_hack.c
-        ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/init_ram.c
     )
 
     if(VmVirtUart)

components/VM_Arm/src/main.c

@@ -662,13 +662,36 @@ static void irq_handler(void *data, ps_irq_acknowledge_fn_t acknowledge_fn, void
     }
 }
 
+/* Default RAM initialization. Modules can overwrite this weak function with a
+ * custom initialization, e.g. to use memory shared with other components or
+ * mapped on demand.
+ */
+WEAK int vm_init_ram(vm_t *vm, const vm_config_t *vm_config)
+{
+    /* A VM without RAM is highly unusual and unlikely to work. But there might
+     * be special VM configurations where modules create special RAM areas.
+     */
+    if (0 == vm_config->ram.size) {
+        ZF_LOGW("no RAM defined");
+        return 0;
+    }
+
+    int err = vm_ram_register_at(vm, vm_config->ram.base, vm_config->ram.size,
+                                 vm->mem.map_one_to_one);
+    if (err) {
+        ZF_LOGE("RAM registration failed (%d)", err);
+        return -1;
+    }
+
+    return 0;
+}
 
 /* Force the _vmm_module  section to be created even if no modules are defined. */
 static USED SECTION("_vmm_module") struct {} dummy_module;
 extern vmm_module_t __start__vmm_module[];
 extern vmm_module_t __stop__vmm_module[];
 
-static int install_vm_devices(vm_t *vm)
+static int install_vm_devices(vm_t *vm, const vm_config_t *vm_config)
 {
     int err;
 
@@ -678,6 +701,13 @@ static int install_vm_devices(vm_t *vm)
         assert(!err);
     }
 
+    /* Initialize guest RAM. */
+    err = vm_init_ram(vm, vm_config);
+    if (err) {
+        ZF_LOGE("Failed to initialize RAM (%d)", err);
+        return -1;
+    }
+
     int max_vmm_modules = (int)(__stop__vmm_module - __start__vmm_module);
     int num_vmm_modules = 0;
     for (vmm_module_t *i = __start__vmm_module; i < __stop__vmm_module; i++) {
@@ -874,7 +904,7 @@ static int load_vm(vm_t *vm, const vm_config_t *vm_config)
     vm->mem.map_one_to_one = vm_config->map_one_to_one; /* Map memory 1:1 if configured to do so */
 
     /* Install devices */
-    err = install_vm_devices(vm);
+    err = install_vm_devices(vm, vm_config);
     if (err) {
         printf("Error: Failed to install VM devices\n");
         return -1;