refactor(mem_range): rename, extend, refactor helpers
The helpers to operate 'struct mem_range' have been
extended.
Helpers which are unused, are intended for subsequent
patches.
Change-Id: I85aaf5f532c82e7f9329773cbc18a8119d4a0ee6
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/src/manifest.c b/src/manifest.c
index a9b61e4..a77bba2 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -24,6 +24,7 @@
#include "hf/ffa.h"
#include "hf/ffa_partition_manifest.h"
#include "hf/layout.h"
+#include "hf/mem_range.h"
#include "hf/mm.h"
#include "hf/mpool.h"
#include "hf/sp_pkg.h"
@@ -507,11 +508,6 @@
return MANIFEST_SUCCESS;
}
-static bool mem_range_contains(struct mem_range range, uintptr_t address)
-{
- return pa_addr(range.begin) <= address && address <= pa_addr(range.end);
-}
-
/**
* Return true if the region described by `region_start` and `page_count`
* overlaps with any of `ranges`.
@@ -521,12 +517,10 @@
const struct mem_range ranges[],
size_t ranges_size)
{
- uintptr_t region_end =
- region_start + ((uintptr_t)page_count * PAGE_SIZE - 1);
+ struct mem_range region = make_mem_range(region_start, page_count);
for (size_t i = 0; i < ranges_size; i++) {
- if (mem_range_contains(ranges[i], region_start) ||
- mem_range_contains(ranges[i], region_end)) {
+ if (mem_range_overlaps(ranges[i], region)) {
return true;
}
}
@@ -823,7 +817,7 @@
make_mem_range(mem_regions[i].base_address,
mem_regions[i].page_count);
- if (mem_range_contains(range, load_address)) {
+ if (mem_range_contains_address(range, load_address)) {
return MANIFEST_ERROR_MEM_REGION_OVERLAP;
}
}