commit 451eb2fc9cbdb4015cca4503b7cb146d4a27df83
author Kathleen Capella <kathleen.capella@arm.com> Thu Feb 13 11:52:36 2025 -0500
committer Kathleen Capella <kathleen.capella@arm.com> Tue Mar 04 14:38:13 2025 -0600
tree 4de9726e7880a91875bb9b43b060cfd1dbfaf309
parent dbb42a2b3f50347b7d9cfd825330269ee7f6668d

feat(sptool): add StMM memory region descriptor

StandaloneMM partition requires that the first memory region in its list
of reserved memory regions describe the full partition layout. Hafnium
SPMC checks that memory regions in FF-A manifest do not overlap.
Therefore, this region is added directly in HOB generation code rather
than as a memory region in the FF-A manifest for the StMM partition.

Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
Change-Id: Ia22174d755a5776e20ecf9639584f3c08cf9e60e

tools/sptool/hob.py

diff --git a/tools/sptool/hob.py b/tools/sptool/hob.py
index 9715f40..dced086 100644
--- a/tools/sptool/hob.py
+++ b/tools/sptool/hob.py
@@ -312,6 +312,13 @@
     return ("4Q", (physical_start, cpu_start, physical_size, region_state))
 
 
+def generate_stmm_region_descriptor(base_addr, physical_size):
+    region_state = STMM_MMRAM_REGION_STATE_DEFAULT
+    physical_start = base_addr
+    cpu_start = base_addr
+    return ("4Q", (physical_start, cpu_start, physical_size, region_state))
+
+
 def generate_ns_buffer_guid(mmram_desc):
     return HobGuid(EfiGuid(*MM_NS_BUFFER_GUID), *mmram_desc)
 
@@ -346,6 +353,12 @@
     if img_size is None:
         img_size = 0x0
 
+    regions = []
+
+    # StMM requires the first memory region described in the
+    # MM_PEI_MMRAM_MEMORY_RESERVE_GUID describe the full partition layout.
+    regions.append(generate_stmm_region_descriptor(load_address, img_size))
+
     if sp_fdt.exist_node("memory-regions"):
         if sp_fdt.exist_property("xlat-granule"):
             granule = int(sp_fdt.get_property("xlat-granule").value)
@@ -353,7 +366,6 @@
             # Default granule to 4K
             granule = 0
         memory_regions = sp_fdt.get_node("memory-regions")
-        regions = []
         for node in memory_regions.nodes:
             base_addr = get_integer_property_value(node, "base-address")
             page_count = get_integer_property_value(node, "pages-count")