RTOS/seL4
1
0
Fork 0
forked from Imagelibrary/seL4
Code Pull Requests Activity

tools: merge adjacent memory regions

Browse Source 
Merge memory regions before checking for reserved areas

Co-authored-by: Gerwin Klein <gerwin.klein@proofcraft.systems>

Signed-off-by: Bertrand Virfollet <bvirfollet@silicom.fr>
Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>
This commit is contained in:
Bertrand Virfollet
2021-04-16 16:21:11 +02:00
committed by Gerwin Klein
parent 975f86b742
commit b32b9568b2
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/hardware/utils/memory.py
View File

@@ -26,6 +26,36 @@ def get_memory_regions(tree: FdtParser):
return regions
def merge_memory_regions(regions: Set[Region]) -> Set[Region]:
''' Check all region and merge adjacent ones '''
all_regions = [dict(idx=idx, region=region, right_adj=None, left_adj=None)
for (idx, region) in enumerate(regions)]
# Find all right contiguous regions
for dreg in all_regions:
for dnreg in all_regions[dreg['idx']+1:]:
if dreg['region'].owner == dnreg['region'].owner:
if dnreg['region'].base == dreg['region'].base + dreg['region'].size:
dreg['right_adj'] = dnreg
dnreg['left_adj'] = dreg
elif dreg['region'].base == dnreg['region'].base + dnreg['region'].size:
dnreg['right_adj'] = dreg
dreg['left_adj'] = dnreg
# Find all the left-most contiguous regions
contiguous_regions = set()
for reg in all_regions:
if reg['left_adj'] is None:
size = reg['region'].size
r_adj = reg['right_adj']
while r_adj is not None:
size += r_adj['region'].size
r_adj = r_adj['right_adj']
contiguous_regions.add(Region(reg['region'].base, size, reg['region'].owner))
return contiguous_regions
def parse_reserved_regions(node: WrappedNode) -> Set[Region]:
''' Parse a reserved-memory node, looking for regions that are
unusable by OS (e.g. reserved for firmware/bootloader) '''
@@ -56,7 +86,7 @@ def reserve_regions(regions: Set[Region], reserved: Set[Region]) -> Set[Region]:
def get_physical_memory(tree: FdtParser, config: Config) -> List[Region]:
''' returns a list of regions representing physical memory as used by the kernel '''
regions = get_memory_regions(tree)
regions = merge_memory_regions(get_memory_regions(tree))
reserved = parse_reserved_regions(tree.get_path('/reserved-memory'))
regions = reserve_regions(regions, reserved)
regions, extra_reserved, physBase = config.align_memory(regions)