aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch b/target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch
new file mode 100644
index 0000000000..1dca71c064
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0031-crypto-caam-add-caam_dma-device-on-caam_probe.patch
@@ -0,0 +1,67 @@
+From 0547020c73ab7a457f3e1601ef822b61f0b963b9 Mon Sep 17 00:00:00 2001
+From: Radu Alexe <radu.alexe@nxp.com>
+Date: Wed, 8 Nov 2017 17:22:12 +0200
+Subject: [PATCH] crypto: caam - add caam_dma device on caam_probe
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Dynamically create a platform device for the caam_dma driver
+at caam_probe() time.
+
+Signed-off-by: Radu Alexe <radu.alexe@nxp.com>
+Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
+
+Use devres for caam_dma platform device unregistering.
+
+Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
+---
+ drivers/crypto/caam/ctrl.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+--- a/drivers/crypto/caam/ctrl.c
++++ b/drivers/crypto/caam/ctrl.c
+@@ -566,12 +566,22 @@ static void caam_remove_debugfs(void *ro
+ }
+ #endif
+
++static void caam_dma_dev_unregister(void *data)
++{
++ platform_device_unregister(data);
++}
++
+ /* Probe routine for CAAM top (controller) level */
+ static int caam_probe(struct platform_device *pdev)
+ {
+ int ret, ring, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
+ u64 caam_id;
+ const struct soc_device_attribute *imx_soc_match;
++ static struct platform_device_info caam_dma_pdev_info = {
++ .name = "caam-dma",
++ .id = PLATFORM_DEVID_NONE
++ };
++ static struct platform_device *caam_dma_dev;
+ struct device *dev;
+ struct device_node *nprop, *np;
+ struct resource res_regs;
+@@ -849,6 +859,20 @@ set_dma_mask:
+ return -ENOMEM;
+ }
+
++ caam_dma_pdev_info.parent = dev;
++ caam_dma_pdev_info.dma_mask = dma_get_mask(dev);
++ caam_dma_dev = platform_device_register_full(&caam_dma_pdev_info);
++ if (IS_ERR(caam_dma_dev)) {
++ dev_err(dev, "Unable to create and register caam-dma dev\n");
++ return PTR_ERR(caam_dma_dev);
++ } else {
++ set_dma_ops(&caam_dma_dev->dev, get_dma_ops(dev));
++ ret = devm_add_action_or_reset(dev, caam_dma_dev_unregister,
++ caam_dma_dev);
++ if (ret)
++ return ret;
++ }
++
+ if (!reg_access)
+ goto report_live;
+