core: mm: simplify overlap check

Overlap region check could be simplified as below: "(StartA <= EndB) and (StartB <= EndA)" Signed-off-by: Peng Fan <[email protected]> Reviewed-by: Joakim Bech <[email protected]>
gagachang · Feb 21, 2019 · dfcb422 · dfcb422
1 parent 69a3d6b
commit dfcb422
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/arch/arm/mm/core_mmu.c b/core/arch/arm/mm/core_mmu.c
@@ -571,8 +571,8 @@ static void add_phys_mem(struct tee_mmap_region *memory_map, size_t num_elems,
 		pa = memory_map[n].pa;
 		size = memory_map[n].size;
 		if (mem->type == memory_map[n].type &&
-		    ((mem->addr >= pa && mem->addr <= (pa + (size - 1))) ||
-		    (pa >= mem->addr && pa <= (mem->addr + (mem->size - 1))))) {
+		    ((pa <= (mem->addr + (mem->size - 1))) &&
+		    (mem->addr <= (pa + (size - 1))))) {
 			DMSG("Physical mem map overlaps 0x%" PRIxPA, mem->addr);
 			memory_map[n].pa = MIN(pa, mem->addr);
 			memory_map[n].size = MAX(size, mem->size) +