diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-16 10:54:37 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-16 10:54:37 +0200 |
commit | 0ae461c2ee6baed1a94b88c0ecfc4a9d0f4e5201 (patch) | |
tree | 7c6e35c227d10607d6f15e91b69fb2e96f6c1a8c /common | |
parent | 226938796e525f42e002769f21dc66d16ac26f9b (diff) | |
parent | 73a9619b85497d19b74e6a023aa9ce0e88a1143d (diff) | |
download | barebox-0ae461c2ee6baed1a94b88c0ecfc4a9d0f4e5201.tar.gz barebox-0ae461c2ee6baed1a94b88c0ecfc4a9d0f4e5201.tar.xz |
Merge branch 'for-next/overlapping-memory-banks'
Diffstat (limited to 'common')
-rw-r--r-- | common/memory.c | 64 | ||||
-rw-r--r-- | common/resource.c | 22 |
2 files changed, 79 insertions, 7 deletions
diff --git a/common/memory.c b/common/memory.c index 392522bfc3..95995bb6e3 100644 --- a/common/memory.c +++ b/common/memory.c @@ -111,19 +111,56 @@ void *sbrk(ptrdiff_t increment) LIST_HEAD(memory_banks); +static int barebox_grow_memory_bank(struct memory_bank *bank, const char *name, + const struct resource *newres) +{ + struct resource *res; + resource_size_t bank_end = bank->res->end; + + if (newres->start < bank->start) { + res = request_iomem_region(name, newres->start, bank->start - 1); + if (IS_ERR(res)) + return PTR_ERR(res); + __merge_regions(name, bank->res, res); + } + + if (bank_end < newres->end) { + res = request_iomem_region(name, bank_end + 1, newres->end); + if (IS_ERR(res)) + return PTR_ERR(res); + __merge_regions(name, bank->res, res); + } + + bank->start = newres->start; + bank->size = resource_size(bank->res); + + return 0; +} + int barebox_add_memory_bank(const char *name, resource_size_t start, resource_size_t size) { - struct memory_bank *bank = xzalloc(sizeof(*bank)); - struct device_d *dev; + struct memory_bank *bank; + struct resource *res; + struct resource newres = { + .start = start, + .end = start + size - 1, + }; + + for_each_memory_bank(bank) { + if (resource_contains(bank->res, &newres)) + return 0; + if (resource_contains(&newres, bank->res)) + return barebox_grow_memory_bank(bank, name, &newres); + } - bank->res = request_iomem_region(name, start, start + size - 1); - if (IS_ERR(bank->res)) - return PTR_ERR(bank->res); + res = request_iomem_region(name, start, start + size - 1); + if (IS_ERR(res)) + return PTR_ERR(res); - dev = add_mem_device(name, start, size, IORESOURCE_MEM_WRITEABLE); + bank = xzalloc(sizeof(*bank)); - bank->dev = dev; + bank->res = res; bank->start = start; bank->size = size; @@ -132,6 +169,19 @@ int barebox_add_memory_bank(const char *name, resource_size_t start, return 0; } +static int add_mem_devices(void) +{ + struct memory_bank *bank; + + for_each_memory_bank(bank) { + add_mem_device(bank->res->name, bank->start, bank->size, + IORESOURCE_MEM_WRITEABLE); + } + + return 0; +} +mmu_initcall(add_mem_devices); + /* * Request a region from the registered sdram */ diff --git a/common/resource.c b/common/resource.c index ff4318a0d7..f96cb94b50 100644 --- a/common/resource.c +++ b/common/resource.c @@ -102,6 +102,28 @@ int release_region(struct resource *res) return 0; } + +/* + * merge two adjacent sibling regions. + */ +int __merge_regions(const char *name, + struct resource *resa, struct resource *resb) +{ + if (!resource_adjacent(resa, resb)) + return -EINVAL; + + if (resa->start < resb->start) + resa->end = resb->end; + else + resa->start = resb->start; + + free((char *)resa->name); + resa->name = xstrdup(name); + release_region(resb); + + return 0; +} + /* The root resource for the whole memory-mapped io space */ struct resource iomem_resource = { .start = 0, |