misc: sram: Generate unique names for subpools
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 20 Apr 2023 21:17:35 +0000 (23:17 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 17 May 2023 07:15:25 +0000 (09:15 +0200)
The current code will, if we do not specify unique labels
for the SRAM subnodes, fail to register several nodes named
the same.

Example:

sram@40020000 {
  (...)
  sram@0 {
    (...)
  };
  sram@1000 {
    (...)
  };
};

Since the child->name in both cases will be "sram" the
gen_pool_create() will fail because the name is not unique.

Use dev_name() for the device as this will have bus ID
set to the fully translated address for the node, and that
will always be unique.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230417-ux500-sram-v2-2-6e62ad551faa@linaro.org
drivers/misc/sram.c

index 9941331..5757adf 100644 (file)
@@ -235,10 +235,11 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
                                goto err_chunks;
                        }
                        if (!label)
-                               label = child->name;
-
-                       block->label = devm_kstrdup(sram->dev,
-                                                   label, GFP_KERNEL);
+                               block->label = devm_kasprintf(sram->dev, GFP_KERNEL,
+                                                             "%s", dev_name(sram->dev));
+                       else
+                               block->label = devm_kstrdup(sram->dev,
+                                                           label, GFP_KERNEL);
                        if (!block->label) {
                                ret = -ENOMEM;
                                goto err_chunks;