Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbe8a774 authored by Stephen Boyd's avatar Stephen Boyd Committed by Runmin Wang
Browse files

memblock: Add memblock_overlaps_memory() 



Add a new function, memblock_overlaps_memory(), to check if a
region overlaps with a memory bank. This will be used by
peripheral loader code to detect when kernel memory would be
overwritten.

Change-Id: I851f8f416a0f36e85c0e19536b5209f7d4bd431c
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>

memblock: Fix memblock_overlaps_memory()

This function always returns true, because it calls
memblock_overlaps_region() which returns a bool now. Change the
signature to bool and pass it on up instead.

Change-Id: I4b6403b823d20552a28006e35083d8056346dc51
Cc: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent b0f7b114

include/linux/memblock.h

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ int memblock_is_map_memory(phys_addr_t addr); 
int memblock_is_region_memory(phys_addr_t base, phys_addr_t size);

bool memblock_is_reserved(phys_addr_t addr);

bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);

bool memblock_overlaps_memory(phys_addr_t base, phys_addr_t size);



extern void __memblock_dump_all(void);

mm/memblock.c

+8 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,14 @@ int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size 
		 memblock.memory.regions[idx].size) >= end;

}



bool __init_memblock memblock_overlaps_memory(phys_addr_t base,

					      phys_addr_t size)

{

	memblock_cap_size(base, &size);



	return memblock_overlaps_region(&memblock.memory, base, size);

}



/**

 * memblock_is_region_reserved - check if a region intersects reserved memory

 * @base: base of region to check