4 files changed, 23 insertions, 6 deletions

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 3c0eb9b25535..986cd111d4df 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -233,8 +233,6 @@ void __init cpm_reset(void)
         else
                 out_be32(&siu_conf->sc_sdcr, 1);
         immr_unmap(siu_conf);
-
-        cpm_muram_init();
 }
 
 static DEFINE_SPINLOCK(cmd_lock);
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index 8dc1e24f3c23..f78ff841652c 100644
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -66,10 +66,6 @@ void __init cpm2_reset(void)
         cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE);
 #endif
 
-        /* Reclaim the DP memory for our use.
-         */
-        cpm_muram_init();
-
         /* Tell everyone where the comm processor resides.
          */
         cpmp = &cpm2_immr->im_cpm;
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c
index 947f42007734..51bf749a4f3a 100644
--- a/arch/powerpc/sysdev/cpm_common.c
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -37,6 +37,21 @@
 #include <linux/of_gpio.h>
 #endif
 
+static int __init cpm_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm1");
+        if (!np)
+                np = of_find_compatible_node(NULL, NULL, "fsl,cpm2");
+        if (!np)
+                return -ENODEV;
+        cpm_muram_init();
+        of_node_put(np);
+        return 0;
+}
+subsys_initcall(cpm_init);
+
 #ifdef CONFIG_PPC_EARLY_DEBUG_CPM
 static u32 __iomem *cpm_udbg_txdesc;
 static u8 __iomem *cpm_udbg_txbuf;
diff --git a/drivers/soc/fsl/qe/qe_common.c b/drivers/soc/fsl/qe/qe_common.c
index 41eff805a904..104e68d9b84f 100644
--- a/drivers/soc/fsl/qe/qe_common.c
+++ b/drivers/soc/fsl/qe/qe_common.c
@@ -70,6 +70,11 @@ int cpm_muram_init(void)
         }
 
         muram_pool = gen_pool_create(0, -1);
+        if (!muram_pool) {
+                pr_err("Cannot allocate memory pool for CPM/QE muram");
+                ret = -ENOMEM;
+                goto out_muram;
+        }
         muram_pbase = of_translate_address(np, zero);
         if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
                 pr_err("Cannot translate zero through CPM muram node");
@@ -116,6 +121,9 @@ static unsigned long cpm_muram_alloc_common(unsigned long size,
         struct muram_block *entry;
         unsigned long start;
 
+        if (!muram_pool && cpm_muram_init())
+                goto out2;
+
         start = gen_pool_alloc_algo(muram_pool, size, algo, data);
         if (!start)
                 goto out2;