diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-10-17 15:39:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-10-18 10:52:42 +0200 |
| commit | c5831bbb5151c40299ee254827958e4375f43e85 (patch) | |
| tree | 4b584e574ec0d38785ed67b1c53a71cbc42be9b4 /common | |
| parent | 6c17dd42db026ff7aee6e04d95bb440e120bb052 (diff) | |
| download | barebox-c5831bbb5151c40299ee254827958e4375f43e85.tar.gz barebox-c5831bbb5151c40299ee254827958e4375f43e85.tar.xz | |
resource: fix recently broken memory bank fusing
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@mev.co.uk>
Fixes: d0b5f6bde15b ("of: reserved-mem: reserve regions prior to mmu_initcall()")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Tested-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.barebox.org/20221017133859.299705-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/memory.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/memory.c b/common/memory.c index 7e24ecb2bd..0ae9e7383c 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) { |