commit 6e5c99643b199e064f1e8090d963671965ced1d7
author Soby Mathew <soby.mathew@arm.com> Fri Oct 06 16:38:13 2023 +0100
committer Shruti Gupta <shruti.gupta@arm.com> Tue Oct 10 14:31:18 2023 +0100
tree c5079b4d7de61ed810e5241021b5005d35990ba7
parent 92b99ee435ebafa5e503b19dce753079ad35218d

fix(rme): append realm.bin at end of tftf.bin

Currently realm.bin is appended to tftf.bin at offset of 10 MB.
This patch removes this dependency by reserving empty sections
for realm image and dependencies, in tftf binary after
all loadable sections (end of binary),
and append realm.bin at end of tftf.bin later in build process.

The patch removes the need for TFTF to map memory corresponding
to Realm payload dynamically at runtime.

Change-Id: Iead2dc62ff2965cf7bb03e61c93e76df218da973
Signed-off-by: Shruti Gupta <shruti.gupta@arm.com>

tftf/framework/tftf.ld.S

diff --git a/tftf/framework/tftf.ld.S b/tftf/framework/tftf.ld.S
index e403af0..4559b03 100644
--- a/tftf/framework/tftf.ld.S
+++ b/tftf/framework/tftf.ld.S
@@ -6,17 +6,15 @@
 
 #include <platform_def.h>
 #include <xlat_tables_defs.h>
+#include <host_realm_mem_layout.h>
+
 
 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
 OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
 ENTRY(tftf_entrypoint)
 
-#ifndef TFTF_MAX_IMAGE_SIZE
-#define TFTF_MAX_IMAGE_SIZE DRAM_SIZE
-#endif
-
 MEMORY {
-    RAM (rwx): ORIGIN = TFTF_BASE, LENGTH = TFTF_MAX_IMAGE_SIZE
+    RAM (rwx): ORIGIN = TFTF_BASE, LENGTH = DRAM_SIZE
 }
 
 
@@ -49,10 +47,29 @@
     .data : {
         __DATA_START__ = .;
         *(.data*)
+        . = NEXT(PAGE_SIZE); /* This ensures tftf.bin is aligned to page size. */
         __DATA_END__ = .;
     } >RAM
 
-    stacks (NOLOAD) : {
+   /* End of LOAD Sections. NOLOAD sections begin here. */
+   /*
+    * Memory for Realm Image has to follow next as it will appended to end
+    * of tftf.bin.
+    */
+    realm_payload (NOLOAD) : {
+        __REALM_PAYLOAD_START__ = .;
+        . = __REALM_PAYLOAD_START__ + REALM_MAX_LOAD_IMG_SIZE;
+        __REALM_PAYLOAD_END__ = .;
+    } >RAM
+
+    /* Memory pool for Realm payload tests. */
+    realm_pool (NOLOAD)  : ALIGN(PAGE_SIZE) {
+        __REALM_POOL_START__ = .;
+        . = __REALM_POOL_START__ + NS_REALM_SHARED_MEM_SIZE + PAGE_POOL_MAX_SIZE;
+        __REALM_POOL_END__ = .;
+    } >RAM
+
+    stacks (NOLOAD) : ALIGN(16) {
         __STACKS_START__ = .;
         *(tftf_normal_stacks)
         __STACKS_END__ = .;
@@ -60,9 +77,9 @@
 
     /*
      * The .bss section gets initialised to 0 at runtime.
-     * Its base address must be 16-byte aligned.
+     * Its base address is always PAGE_SIZE aligned.
      */
-    .bss : ALIGN(16) {
+    .bss : {
         __BSS_START__ = .;
         *(SORT_BY_ALIGNMENT(.bss*))
         *(COMMON)
@@ -71,10 +88,9 @@
 
     /*
      * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section and eliminates the unecessary zero init
+     * Removing them from .bss eliminates the unecessary zero init
      */
-    xlat_table (NOLOAD) : {
+    xlat_table (NOLOAD) : ALIGN(PAGE_SIZE) {
         *(xlat_table)
     } >RAM
 
@@ -109,7 +125,6 @@
     __COHERENT_RAM_UNALIGNED_SIZE__ =
         __COHERENT_RAM_END_UNALIGNED__ - __COHERENT_RAM_START__;
 
-
     __TFTF_END__ = .;
 
     __BSS_SIZE__ = SIZEOF(.bss);