1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index ed01c0172e4a..216648233874 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -127,8 +127,15 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
         }
 
         /* Need adjust the alignment to satisfy the CMA requirement */
-        if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool"))
-                align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));
+        if (IS_ENABLED(CONFIG_CMA)
+            && of_flat_dt_is_compatible(node, "shared-dma-pool")
+            && of_get_flat_dt_prop(node, "reusable", NULL)
+            && !of_get_flat_dt_prop(node, "no-map", NULL)) {
+                unsigned long order =
+                        max_t(unsigned long, MAX_ORDER - 1, pageblock_order);
+
+                align = max(align, (phys_addr_t)PAGE_SIZE << order);
+        }
 
         prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
         if (prop) {