genalloc: add name arg to gen_pool_get() and devm_gen_pool_create()

This change modifies gen_pool_get() and devm_gen_pool_create() client
interfaces adding one more argument "name" of a gen_pool object.

Due to implementation gen_pool_get() is capable to retrieve only one
gen_pool associated with a device even if multiple gen_pools are created,
fortunately right at the moment it is sufficient for the clients, hence
provide NULL as a valid argument on both producer devm_gen_pool_create()
and consumer gen_pool_get() sides.

Because only one created gen_pool per device is addressable, explicitly
add a restriction to devm_gen_pool_create() to create only one gen_pool
per device, this implies two possible error codes returned by the
function, account it on client side (only misc/sram).  This completes
client side changes related to genalloc updates.

[akpm@linux-foundation.org: gen_pool_get() cleanup]
Signed-off-by: Vladimir 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 files changed, 39 insertions, 32 deletions

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 265ffeb2037e..80e277cfcc8b 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -369,7 +369,7 @@ static void __init at91_pm_sram_init(void)
                 return;
         }
 
-        sram_pool = gen_pool_get(&pdev->dev);
+        sram_pool = gen_pool_get(&pdev->dev, NULL);
         if (!sram_pool) {
                 pr_warn("%s: sram pool unavailable!\n", __func__);
                 return;
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index 1885676c23c0..532d4b08276d 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -297,7 +297,7 @@ static int __init imx_suspend_alloc_ocram(
                 goto put_node;
         }
 
-        ocram_pool = gen_pool_get(&pdev->dev);
+        ocram_pool = gen_pool_get(&pdev->dev, NULL);
         if (!ocram_pool) {
                 pr_warn("%s: ocram pool unavailable!\n", __func__);
                 ret = -ENODEV;
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 93ecf559d06d..8ff8fc0b261c 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -451,7 +451,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
                 goto put_node;
         }
 
-        ocram_pool = gen_pool_get(&pdev->dev);
+        ocram_pool = gen_pool_get(&pdev->dev, NULL);
         if (!ocram_pool) {
                 pr_warn("%s: ocram pool unavailable!\n", __func__);
                 ret = -ENODEV;
diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c
index 6a4199f2bffb..c378ab0c2431 100644
--- a/arch/arm/mach-socfpga/pm.c
+++ b/arch/arm/mach-socfpga/pm.c
@@ -56,7 +56,7 @@ static int socfpga_setup_ocram_self_refresh(void)
                 goto put_node;
         }
 
-        ocram_pool = gen_pool_get(&pdev->dev);
+        ocram_pool = gen_pool_get(&pdev->dev, NULL);
         if (!ocram_pool) {
                 pr_warn("%s: ocram pool unavailable!\n", __func__);
                 ret = -ENODEV;
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 58f65486de33..284ac4c934ba 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2157,7 +2157,7 @@ static int coda_probe(struct platform_device *pdev)
         /* Get IRAM pool from device tree or platform data */
         pool = of_gen_pool_get(np, "iram", 0);
         if (!pool && pdata)
-                pool = gen_pool_get(pdata->iram_dev);
+                pool = gen_pool_get(pdata->iram_dev, NULL);
         if (!pool) {
                 dev_err(&pdev->dev, "iram pool not available\n");
                 return -ENOMEM;
diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index 15c33cc34a80..431e1dd528bc 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -186,10 +186,10 @@ static int sram_probe(struct platform_device *pdev)
         if (IS_ERR(sram->virt_base))
                 return PTR_ERR(sram->virt_base);
 
-        sram->pool = devm_gen_pool_create(sram->dev,
-                                          ilog2(SRAM_GRANULARITY), -1);
-        if (!sram->pool)
-                return -ENOMEM;
+        sram->pool = devm_gen_pool_create(sram->dev, ilog2(SRAM_GRANULARITY),
+                                          NUMA_NO_NODE, NULL);
+        if (IS_ERR(sram->pool))
+                return PTR_ERR(sram->pool);
 
         ret = sram_reserve_regions(sram, res);
         if (ret)
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 5383bb1394a1..6afa65e6cdb7 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -118,8 +118,8 @@ extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
                 unsigned long start, unsigned int nr, void *data);
 
 extern struct gen_pool *devm_gen_pool_create(struct device *dev,
-                int min_alloc_order, int nid);
-extern struct gen_pool *gen_pool_get(struct device *dev);
+                int min_alloc_order, int nid, const char *name);
+extern struct gen_pool *gen_pool_get(struct device *dev, const char *name);
 
 bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
                         size_t size);
diff --git a/lib/genalloc.c b/lib/genalloc.c
index daf0afb6d979..b13cfd1a366e 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -571,23 +571,46 @@ static void devm_gen_pool_release(struct device *dev, void *res)
 }
 
 /**
+ * gen_pool_get - Obtain the gen_pool (if any) for a device
+ * @dev: device to retrieve the gen_pool from
+ * @name: name of a gen_pool or NULL, identifies a particular gen_pool on device
+ *
+ * Returns the gen_pool for the device if one is present, or NULL.
+ */
+struct gen_pool *gen_pool_get(struct device *dev, const char *name)
+{
+        struct gen_pool **p;
+
+        p = devres_find(dev, devm_gen_pool_release, NULL, NULL);
+        if (!p)
+                return NULL;
+        return *p;
+}
+EXPORT_SYMBOL_GPL(gen_pool_get);
+
+/**
  * devm_gen_pool_create - managed gen_pool_create
  * @dev: device that provides the gen_pool
  * @min_alloc_order: log base 2 of number of bytes each bitmap bit represents
- * @nid: node id of the node the pool structure should be allocated on, or -1
+ * @nid: node selector for allocated gen_pool, %NUMA_NO_NODE for all nodes
+ * @name: name of a gen_pool or NULL, identifies a particular gen_pool on device
  *
  * Create a new special memory pool that can be used to manage special purpose
  * memory not managed by the regular kmalloc/kfree interface. The pool will be
  * automatically destroyed by the device management code.
  */
 struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
-                int nid)
+                                      int nid, const char *name)
 {
         struct gen_pool **ptr, *pool;
 
+        /* Check that genpool to be created is uniquely addressed on device */
+        if (gen_pool_get(dev, name))
+                return ERR_PTR(-EINVAL);
+
         ptr = devres_alloc(devm_gen_pool_release, sizeof(*ptr), GFP_KERNEL);
         if (!ptr)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         pool = gen_pool_create(min_alloc_order, nid);
         if (pool) {
@@ -595,29 +618,13 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
                 devres_add(dev, ptr);
         } else {
                 devres_free(ptr);
+                return ERR_PTR(-ENOMEM);
         }
 
         return pool;
 }
 EXPORT_SYMBOL(devm_gen_pool_create);
 
-/**
- * gen_pool_get - Obtain the gen_pool (if any) for a device
- * @dev: device to retrieve the gen_pool from
- *
- * Returns the gen_pool for the device if one is present, or NULL.
- */
-struct gen_pool *gen_pool_get(struct device *dev)
-{
-        struct gen_pool **p = devres_find(dev, devm_gen_pool_release, NULL,
-                                        NULL);
-
-        if (!p)
-                return NULL;
-        return *p;
-}
-EXPORT_SYMBOL_GPL(gen_pool_get);
-
 #ifdef CONFIG_OF
 /**
  * of_gen_pool_get - find a pool by phandle property
@@ -642,7 +649,7 @@ struct gen_pool *of_gen_pool_get(struct device_node *np,
         of_node_put(np_pool);
         if (!pdev)
                 return NULL;
-        return gen_pool_get(&pdev->dev);
+        return gen_pool_get(&pdev->dev, NULL);
 }
 EXPORT_SYMBOL_GPL(of_gen_pool_get);
 #endif /* CONFIG_OF */