layerscape: add patches-5.4

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 804-crypto-0009-crypto-caam-populate-platform-devices-last.patch

diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0009-crypto-caam-populate-platform-devices-last.patch b/target/linux/layerscape/patches-5.4/804-crypto-0009-crypto-caam-populate-platform-devices-last.patch
new file mode 100644 (file)
index 0000000..8ab1199
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0009-crypto-caam-populate-platform-devices-last.patch
@@ -0,0 +1,56 @@
+From 6d186bceac74dd7fcabac860295cfb7b893168cd Mon Sep 17 00:00:00 2001
+From: Andrey Smirnov <andrew.smirnov@gmail.com>
+Date: Tue, 22 Oct 2019 08:30:13 -0700
+Subject: [PATCH] crypto: caam - populate platform devices last
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move the call to devm_of_platform_populate() at the end of
+caam_probe(), so we won't try to add any child devices until all of
+the initialization is finished successfully.
+
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+Cc: Chris Healy <cphealy@gmail.com>
+Cc: Lucas Stach <l.stach@pengutronix.de>
+Cc: Horia Geantă <horia.geanta@nxp.com>
+Cc: Herbert Xu <herbert@gondor.apana.org.au>
+Cc: Iuliana Prodan <iuliana.prodan@nxp.com>
+Cc: linux-crypto@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+(cherry picked from commit 51d13aaf59779ff4d13f1def2c72ae102a1aad40)
+---
+ drivers/crypto/caam/ctrl.c | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+--- a/drivers/crypto/caam/ctrl.c
++++ b/drivers/crypto/caam/ctrl.c
+@@ -745,12 +745,6 @@ static int caam_probe(struct platform_de
+ #endif
+       }
+ 
+-      ret = devm_of_platform_populate(dev);
+-      if (ret) {
+-              dev_err(dev, "JR platform devices creation error\n");
+-              return ret;
+-      }
+-
+       ring = 0;
+       for_each_available_child_of_node(nprop, np)
+               if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||
+@@ -903,7 +897,12 @@ static int caam_probe(struct platform_de
+       debugfs_create_blob("tdsk", S_IRUSR | S_IRGRP | S_IROTH, ctrlpriv->ctl,
+                           &ctrlpriv->ctl_tdsk_wrap);
+ #endif
+-      return 0;
++
++      ret = devm_of_platform_populate(dev);
++      if (ret)
++              dev_err(dev, "JR platform devices creation error\n");
++
++      return ret;
+ }
+ 
+ static struct platform_driver caam_driver = {