Commit c98c3635 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Linus Torvalds

genalloc: add support of multiple gen_pools per device

This change fills devm_gen_pool_create()/gen_pool_get() "name" argument
stub with contents and extends of_gen_pool_get() functionality on this
basis.

If there is no associated platform device with a device node passed to
of_gen_pool_get(), the function attempts to get a label property or device
node name (= repeats MTD OF partition standard) and seeks for a named
gen_pool registered by device of the parent device node.

The main idea of the change is to allow registration of independent
gen_pools under the same umbrella device, say "partitions" on "storage
device", the original functionality of one "partition" per "storage
device" is untouched.

[akpm@linux-foundation.org: fix constness in devres_find()]
[dan.carpenter@oracle.com: freeing const data pointers]
Signed-off-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 73858173
...@@ -59,6 +59,8 @@ struct gen_pool { ...@@ -59,6 +59,8 @@ struct gen_pool {
genpool_algo_t algo; /* allocation function */ genpool_algo_t algo; /* allocation function */
void *data; void *data;
const char *name;
}; };
/* /*
......
...@@ -160,6 +160,7 @@ struct gen_pool *gen_pool_create(int min_alloc_order, int nid) ...@@ -160,6 +160,7 @@ struct gen_pool *gen_pool_create(int min_alloc_order, int nid)
pool->min_alloc_order = min_alloc_order; pool->min_alloc_order = min_alloc_order;
pool->algo = gen_pool_first_fit; pool->algo = gen_pool_first_fit;
pool->data = NULL; pool->data = NULL;
pool->name = NULL;
} }
return pool; return pool;
} }
...@@ -252,8 +253,8 @@ void gen_pool_destroy(struct gen_pool *pool) ...@@ -252,8 +253,8 @@ void gen_pool_destroy(struct gen_pool *pool)
kfree(chunk); kfree(chunk);
} }
kfree_const(pool->name);
kfree(pool); kfree(pool);
return;
} }
EXPORT_SYMBOL(gen_pool_destroy); EXPORT_SYMBOL(gen_pool_destroy);
...@@ -570,6 +571,20 @@ static void devm_gen_pool_release(struct device *dev, void *res) ...@@ -570,6 +571,20 @@ static void devm_gen_pool_release(struct device *dev, void *res)
gen_pool_destroy(*(struct gen_pool **)res); gen_pool_destroy(*(struct gen_pool **)res);
} }
static int devm_gen_pool_match(struct device *dev, void *res, void *data)
{
struct gen_pool **p = res;
/* NULL data matches only a pool without an assigned name */
if (!data && !(*p)->name)
return 1;
if (!data || !(*p)->name)
return 0;
return !strcmp((*p)->name, data);
}
/** /**
* gen_pool_get - Obtain the gen_pool (if any) for a device * gen_pool_get - Obtain the gen_pool (if any) for a device
* @dev: device to retrieve the gen_pool from * @dev: device to retrieve the gen_pool from
...@@ -581,7 +596,8 @@ struct gen_pool *gen_pool_get(struct device *dev, const char *name) ...@@ -581,7 +596,8 @@ struct gen_pool *gen_pool_get(struct device *dev, const char *name)
{ {
struct gen_pool **p; struct gen_pool **p;
p = devres_find(dev, devm_gen_pool_release, NULL, NULL); p = devres_find(dev, devm_gen_pool_release, devm_gen_pool_match,
(void *)name);
if (!p) if (!p)
return NULL; return NULL;
return *p; return *p;
...@@ -603,25 +619,38 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order, ...@@ -603,25 +619,38 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
int nid, const char *name) int nid, const char *name)
{ {
struct gen_pool **ptr, *pool; struct gen_pool **ptr, *pool;
const char *pool_name = NULL;
/* Check that genpool to be created is uniquely addressed on device */ /* Check that genpool to be created is uniquely addressed on device */
if (gen_pool_get(dev, name)) if (gen_pool_get(dev, name))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (name) {
pool_name = kstrdup_const(name, GFP_KERNEL);
if (!pool_name)
return ERR_PTR(-ENOMEM);
}
ptr = devres_alloc(devm_gen_pool_release, sizeof(*ptr), GFP_KERNEL); ptr = devres_alloc(devm_gen_pool_release, sizeof(*ptr), GFP_KERNEL);
if (!ptr) if (!ptr)
return ERR_PTR(-ENOMEM); goto free_pool_name;
pool = gen_pool_create(min_alloc_order, nid); pool = gen_pool_create(min_alloc_order, nid);
if (pool) { if (!pool)
*ptr = pool; goto free_devres;
devres_add(dev, ptr);
} else { *ptr = pool;
devres_free(ptr); pool->name = pool_name;
return ERR_PTR(-ENOMEM); devres_add(dev, ptr);
}
return pool; return pool;
free_devres:
devres_free(ptr);
free_pool_name:
kfree_const(pool_name);
return ERR_PTR(-ENOMEM);
} }
EXPORT_SYMBOL(devm_gen_pool_create); EXPORT_SYMBOL(devm_gen_pool_create);
...@@ -640,16 +669,30 @@ struct gen_pool *of_gen_pool_get(struct device_node *np, ...@@ -640,16 +669,30 @@ struct gen_pool *of_gen_pool_get(struct device_node *np,
const char *propname, int index) const char *propname, int index)
{ {
struct platform_device *pdev; struct platform_device *pdev;
struct device_node *np_pool; struct device_node *np_pool, *parent;
const char *name = NULL;
struct gen_pool *pool = NULL;
np_pool = of_parse_phandle(np, propname, index); np_pool = of_parse_phandle(np, propname, index);
if (!np_pool) if (!np_pool)
return NULL; return NULL;
pdev = of_find_device_by_node(np_pool); pdev = of_find_device_by_node(np_pool);
if (!pdev) {
/* Check if named gen_pool is created by parent node device */
parent = of_get_parent(np_pool);
pdev = of_find_device_by_node(parent);
of_node_put(parent);
of_property_read_string(np_pool, "label", &name);
if (!name)
name = np_pool->name;
}
if (pdev)
pool = gen_pool_get(&pdev->dev, name);
of_node_put(np_pool); of_node_put(np_pool);
if (!pdev)
return NULL; return pool;
return gen_pool_get(&pdev->dev, NULL);
} }
EXPORT_SYMBOL_GPL(of_gen_pool_get); EXPORT_SYMBOL_GPL(of_gen_pool_get);
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment