From cddd4591404fb4c53dc0b3c0b15b942cdbed4356 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 10 Apr 2020 10:47:05 +0800 Subject: 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 --- ...-crypto-caam-use-devres-to-remove-debugfs.patch | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 target/linux/layerscape/patches-5.4/804-crypto-0005-crypto-caam-use-devres-to-remove-debugfs.patch (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0005-crypto-caam-use-devres-to-remove-debugfs.patch') diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0005-crypto-caam-use-devres-to-remove-debugfs.patch b/target/linux/layerscape/patches-5.4/804-crypto-0005-crypto-caam-use-devres-to-remove-debugfs.patch new file mode 100644 index 0000000000..ff15d95d08 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/804-crypto-0005-crypto-caam-use-devres-to-remove-debugfs.patch @@ -0,0 +1,88 @@ +From 93fbe7c21a64d22ac057fc9e8eed5967f5d0bd88 Mon Sep 17 00:00:00 2001 +From: Andrey Smirnov +Date: Tue, 22 Oct 2019 08:30:09 -0700 +Subject: [PATCH] crypto: caam - use devres to remove debugfs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use devres to remove debugfs and drop corresponding +debugfs_remove_recursive() call. + +Signed-off-by: Andrey Smirnov +Reviewed-by: Horia Geantă +Cc: Chris Healy +Cc: Lucas Stach +Cc: Horia Geantă +Cc: Herbert Xu +Cc: Iuliana Prodan +Cc: linux-crypto@vger.kernel.org +Cc: linux-kernel@vger.kernel.org +Signed-off-by: Herbert Xu +(cherry picked from commit eceb5daf9ebaa564a65eb2d9d5a4682a33747300) +--- + drivers/crypto/caam/ctrl.c | 21 ++++++++++++++------- + drivers/crypto/caam/intern.h | 1 - + 2 files changed, 14 insertions(+), 8 deletions(-) + +--- a/drivers/crypto/caam/ctrl.c ++++ b/drivers/crypto/caam/ctrl.c +@@ -327,11 +327,6 @@ static int caam_remove(struct platform_d + if (!ctrlpriv->mc_en && ctrlpriv->rng4_sh_init) + deinstantiate_rng(ctrldev, ctrlpriv->rng4_sh_init); + +- /* Shut down debug views */ +-#ifdef CONFIG_DEBUG_FS +- debugfs_remove_recursive(ctrlpriv->dfs_root); +-#endif +- + return 0; + } + +@@ -563,6 +558,13 @@ static int init_clocks(struct device *de + return devm_add_action_or_reset(dev, disable_clocks, ctrlpriv); + } + ++#ifdef CONFIG_DEBUG_FS ++static void caam_remove_debugfs(void *root) ++{ ++ debugfs_remove_recursive(root); ++} ++#endif ++ + /* Probe routine for CAAM top (controller) level */ + static int caam_probe(struct platform_device *pdev) + { +@@ -575,6 +577,7 @@ static int caam_probe(struct platform_de + struct caam_drv_private *ctrlpriv; + #ifdef CONFIG_DEBUG_FS + struct caam_perfmon *perfmon; ++ struct dentry *dfs_root; + #endif + u32 scfgr, comp_params; + u8 rng_vid; +@@ -726,8 +729,12 @@ static int caam_probe(struct platform_de + */ + perfmon = (struct caam_perfmon __force *)&ctrl->perfmon; + +- ctrlpriv->dfs_root = debugfs_create_dir(dev_name(dev), NULL); +- ctrlpriv->ctl = debugfs_create_dir("ctl", ctrlpriv->dfs_root); ++ dfs_root = debugfs_create_dir(dev_name(dev), NULL); ++ ret = devm_add_action_or_reset(dev, caam_remove_debugfs, dfs_root); ++ if (ret) ++ return ret; ++ ++ ctrlpriv->ctl = debugfs_create_dir("ctl", dfs_root); + #endif + + /* Check to see if (DPAA 1.x) QI present. If so, enable */ +--- a/drivers/crypto/caam/intern.h ++++ b/drivers/crypto/caam/intern.h +@@ -102,7 +102,6 @@ struct caam_drv_private { + * variables at runtime. + */ + #ifdef CONFIG_DEBUG_FS +- struct dentry *dfs_root; + struct dentry *ctl; /* controller dir */ + struct debugfs_blob_wrapper ctl_kek_wrap, ctl_tkek_wrap, ctl_tdsk_wrap; + #endif -- cgit v1.2.3