fix(gens): add option to define data addr in config

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

Author: danielRep

scripts/config_defs_gen.c

@@ -36,6 +36,12 @@ int main() {
         printf("#define CONFIG_HYP_BASE_ADDR PLAT_BASE_ADDR\n");
     }
 
+    if(config.hyp.data_relocate) {
+        printf("#define CONFIG_HYP_DATA_ADDR (0x%lx)\n", config.hyp.data_addr);
+    } else {
+        printf("#define CONFIG_HYP_DATA_ADDR PLAT_DATA_ADDR\n");
+    }
+
     printf("#define CONFIG_REMIO_DEV_NUM %ld\n", remio_dev_num());
 
     return 0;

scripts/platform_defs_gen.c

@@ -19,12 +19,12 @@ int main() {
     {
         /*
          * Selects the first memory region with RWX (read, write, execute) permissions, and defines
-         * it as PLAT_DATA_MEM. This region is considered the main data memory that Bao will use
+         * it as PLAT_DATA_ADDR. This region is considered the main data memory that Bao will use
          * for its own purposes.
          */
         if(platform.regions[i].perms == MEM_RWX)
         {
-            printf("#define PLAT_DATA_MEM (0x%lx)\n", platform.regions[i].base);
+            printf("#define PLAT_DATA_ADDR (0x%lx)\n", platform.regions[i].base);
             break;
         }
     }

src/core/inc/config.h

@@ -110,6 +110,15 @@ extern struct config {
         bool relocate;
         paddr_t base_addr;
 
+        /**
+         * Only meaningful for non-unified platforms. In such platforms, the hypervisor expects a
+         * base address for data memory and will default to the first RWX region defined in the
+         * target platform's description. If the user wishes to relocate it to another address,
+         * they must set data_relocate to true and provide the new base address.
+         */
+        bool data_relocate;
+        paddr_t data_addr;
+
         /* Hypervisor colors */
         colormap_t colors;
     } hyp;

src/linker.ld

@@ -34,7 +34,7 @@ SECTIONS
 	_data_lma_start = .;
 
 #ifdef MEM_NON_UNIFIED
-	. = PLAT_DATA_MEM;	/* Changed location counter to VMA address */
+	. = CONFIG_HYP_DATA_ADDR;	/* Changed location counter to VMA address */
 #endif
 
 	_data_vma_start = .;