of: reserved_mem: use -ENODEV instead of -ENOENT

When given reserved memory region doesn't really support given node,
return -ENODEV instead of -ENOENT. Then fix __reserved_mem_init_node()
function to properly propagate error code different from -ENODEV instead
of silently ignoring it.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://patch.msgid.link/20260325090023.3175348-3-m.szyprowski@samsung.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 6705b7afebf00bb28ff0f120363bbd1788172c09..9aff460a0420d00ae23f57e02b5a5d6ee5211220 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -488,9 +488,10 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem,
 {
        extern const struct of_device_id __reservedmem_of_table[];
        const struct of_device_id *i;
-       int ret = -ENOENT;
+       int ret = -ENODEV;
 
-       for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
+       for (i = __reservedmem_of_table; ret == -ENODEV &&
+            i < &__rmem_of_table_sentinel; i++) {
                reservedmem_of_init_fn initfn = i->data;
                const char *compat = i->compatible;
 
@@ -574,7 +575,7 @@ static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem,
        nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;
 
        err = __reserved_mem_init_node(rmem, node);
-       if (err != 0 && err != -ENOENT) {
+       if (err != 0 && err != -ENODEV) {
                pr_info("node %s compatible matching fail\n", rmem->name);
                if (nomap)
                        memblock_clear_nomap(rmem->base, rmem->size);

diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index 34621acbd3c5994d32985c1330639685f97eb2a8..64f9ba618e194426f69fc3e1ac9c98338a98d841 100644 (file)
--- a/kernel/dma/coherent.c
+++ b/kernel/dma/coherent.c
@@ -370,7 +370,7 @@ static const struct reserved_mem_ops rmem_dma_ops = {
 static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *rmem)
 {
        if (of_get_flat_dt_prop(node, "reusable", NULL))
-               return -EINVAL;
+               return -ENODEV;
 
 #ifdef CONFIG_ARM
        if (!of_get_flat_dt_prop(node, "no-map", NULL)) {

diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index 81a2fa4971ee300eedada59770f875fc279a6bd4..e6fc6906b5c039d702b8807607790c56d1bab7d4 100644 (file)
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -483,7 +483,7 @@ static int __init rmem_cma_setup(unsigned long node, struct reserved_mem *rmem)
 
        if (!of_get_flat_dt_prop(node, "reusable", NULL) ||
            of_get_flat_dt_prop(node, "no-map", NULL))
-               return -EINVAL;
+               return -ENODEV;
 
        if (!IS_ALIGNED(rmem->base | rmem->size, CMA_MIN_ALIGNMENT_BYTES)) {
                pr_err("Reserved memory: incorrect alignment of CMA region\n");