On 17/10/2022 14:39, Ahmad Fatoum wrote:
barebox will fuse overlapping memory banks to avoid the common issue of
the device tree being modified upstream to contain a minimum RAM size
that would then conflict with a RAM size barebox determines by
querying the memory controller. This was recently broken, because we
changed memory banks to have IORESOURCE_MEM in their flags field,
but resource_contains() used to compare regions won't return true if
memory type differs. Fix this by settings .flags = IORESOURCE_MEM
for the new resource as well.
Reported-by: Ian Abbott <abbotti@xxxxxxxxx>
Fixes: d0b5f6bde15b ("of: reserved-mem: reserve regions prior to mmu_initcall()")
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
common/memory.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/memory.c b/common/memory.c
index 7e24ecb2bd03..0ae9e7383cce 100644
--- a/common/memory.c
+++ b/common/memory.c
@@ -149,6 +149,7 @@ int barebox_add_memory_bank(const char *name, resource_size_t start,
struct resource newres = {
.start = start,
.end = start + size - 1,
+ .flags = IORESOURCE_MEM,
};
for_each_memory_bank(bank) {
Tested-by: Ian Abbott <abbotti@xxxxxxxxx>
--
-=( Ian Abbott <abbotti@xxxxxxxxx> || MEV Ltd. is a company )=-
-=( registered in England & Wales. Regd. number: 02862268. )=-
-=( Regd. addr.: S11 & 12 Building 67, Europa Business Park, )=-
-=( Bird Hall Lane, STOCKPORT, SK3 0XA, UK. || www.mev.co.uk )=-
