memory: return error in barebox_add_memory_bank
When a memory bank is already registered, return an error code instead of throwing a bug. This can happen if a board has registered a memory bank and the same bank is then probed from the devicetree. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
bad4d7cd75
commit
b36cc0f884
|
@ -113,15 +113,15 @@ void *sbrk(ptrdiff_t increment)
|
||||||
|
|
||||||
LIST_HEAD(memory_banks);
|
LIST_HEAD(memory_banks);
|
||||||
|
|
||||||
void barebox_add_memory_bank(const char *name, resource_size_t start,
|
int barebox_add_memory_bank(const char *name, resource_size_t start,
|
||||||
resource_size_t size)
|
resource_size_t size)
|
||||||
{
|
{
|
||||||
struct memory_bank *bank = xzalloc(sizeof(*bank));
|
struct memory_bank *bank = xzalloc(sizeof(*bank));
|
||||||
struct device_d *dev;
|
struct device_d *dev;
|
||||||
|
|
||||||
bank->res = request_iomem_region(name, start, start + size - 1);
|
bank->res = request_iomem_region(name, start, start + size - 1);
|
||||||
|
if (!bank->res)
|
||||||
BUG_ON(!bank->res);
|
return -EBUSY;
|
||||||
|
|
||||||
dev = add_mem_device(name, start, size, IORESOURCE_MEM_WRITEABLE);
|
dev = add_mem_device(name, start, size, IORESOURCE_MEM_WRITEABLE);
|
||||||
|
|
||||||
|
@ -130,6 +130,8 @@ void barebox_add_memory_bank(const char *name, resource_size_t start,
|
||||||
bank->size = size;
|
bank->size = size;
|
||||||
|
|
||||||
list_add_tail(&bank->list, &memory_banks);
|
list_add_tail(&bank->list, &memory_banks);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -18,7 +18,7 @@ struct memory_bank {
|
||||||
|
|
||||||
extern struct list_head memory_banks;
|
extern struct list_head memory_banks;
|
||||||
|
|
||||||
void barebox_add_memory_bank(const char *name, resource_size_t start,
|
int barebox_add_memory_bank(const char *name, resource_size_t start,
|
||||||
resource_size_t size);
|
resource_size_t size);
|
||||||
|
|
||||||
#define for_each_memory_bank(mem) list_for_each_entry(mem, &memory_banks, list)
|
#define for_each_memory_bank(mem) list_for_each_entry(mem, &memory_banks, list)
|
||||||
|
|
Loading…
Reference in New Issue