* [PATCH v3 1/4] dt-bindings: crypto: Mention clocks for mxs-dcp
2018-10-16 15:57 [PATCH v3 0/4] Port mxs-dcp to imx6ull and imx6sll Leonard Crestez
@ 2018-10-16 15:57 ` Leonard Crestez
2018-10-16 15:57 ` [PATCH v3 2/4] crypto: mxs-dcp - Add support for dcp clk Leonard Crestez
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Leonard Crestez @ 2018-10-16 15:57 UTC (permalink / raw)
To: Shawn Guo, Fabio Estevam
Cc: Rob Herring, Marek Vasut, Herbert Xu, Horia Geanta,
Franck Lenormand, Aymen Sghaier, David S . Miller ,
Mark Rutland, devicetree, linux-crypto, linux-arm-kernel,
dl-linux-imx, kernel, linux-kernel
Explicit clock enabling is required on 6sll and 6ull so mention that
standard clock bindings are used.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
Documentation/devicetree/bindings/crypto/fsl-dcp.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-dcp.txt b/Documentation/devicetree/bindings/crypto/fsl-dcp.txt
index 76a0b4e80e83..4e4d387e38a5 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-dcp.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-dcp.txt
@@ -4,10 +4,12 @@ Required properties:
- compatible : Should be "fsl,<soc>-dcp"
- reg : Should contain MXS DCP registers location and length
- interrupts : Should contain MXS DCP interrupt numbers, VMI IRQ and DCP IRQ
must be supplied, optionally Secure IRQ can be present, but
is currently not implemented and not used.
+- clocks : Clock reference (only required on some SOCs: 6ull and 6sll).
+- clock-names : Must be "dcp".
Example:
dcp@80028000 {
compatible = "fsl,imx28-dcp", "fsl,imx23-dcp";
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/4] crypto: mxs-dcp - Add support for dcp clk
2018-10-16 15:57 [PATCH v3 0/4] Port mxs-dcp to imx6ull and imx6sll Leonard Crestez
2018-10-16 15:57 ` [PATCH v3 1/4] dt-bindings: crypto: Mention clocks for mxs-dcp Leonard Crestez
@ 2018-10-16 15:57 ` Leonard Crestez
2018-10-16 16:03 ` Fabio Estevam
2018-10-16 15:57 ` [PATCH v3 3/4] ARM: dts: imx6ull: Add dcp node Leonard Crestez
2018-10-16 15:57 ` [PATCH v3 4/4] ARM: imx_v6_v7_defconfig: Enable CRYPTO_DEV_MXS_DCP Leonard Crestez
3 siblings, 1 reply; 8+ messages in thread
From: Leonard Crestez @ 2018-10-16 15:57 UTC (permalink / raw)
To: Shawn Guo, Fabio Estevam
Cc: Rob Herring, Marek Vasut, Herbert Xu, Horia Geanta,
Franck Lenormand, Aymen Sghaier, David S . Miller ,
Mark Rutland, devicetree, linux-crypto, linux-arm-kernel,
dl-linux-imx, kernel, linux-kernel
On 6ull and 6sll the DCP block has a clock which needs to be explicitly
enabled.
Add minimal handling for this at probe/remove time.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
---
drivers/crypto/mxs-dcp.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
index 4e6ff32f8a7e..a9855f622e05 100644
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
@@ -18,10 +18,11 @@
#include <linux/kthread.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/stmp_device.h>
+#include <linux/clk.h>
#include <crypto/aes.h>
#include <crypto/sha.h>
#include <crypto/internal/hash.h>
#include <crypto/internal/skcipher.h>
@@ -80,10 +81,11 @@ struct dcp {
struct completion completion[DCP_MAX_CHANS];
spinlock_t lock[DCP_MAX_CHANS];
struct task_struct *thread[DCP_MAX_CHANS];
struct crypto_queue queue[DCP_MAX_CHANS];
+ struct clk *dcp_clk;
};
enum dcp_chan {
DCP_CHAN_HASH_SHA = 0,
DCP_CHAN_CRYPTO = 2,
@@ -1027,10 +1029,21 @@ static int mxs_dcp_probe(struct platform_device *pdev)
sdcp->dev = dev;
sdcp->base = devm_ioremap_resource(dev, iores);
if (IS_ERR(sdcp->base))
return PTR_ERR(sdcp->base);
+ /* DCP clock is optional, only used on some SOCs */
+ sdcp->dcp_clk = devm_clk_get(dev, "dcp");
+ if (IS_ERR(sdcp->dcp_clk)) {
+ if (sdcp->dcp_clk != ERR_PTR(-ENOENT))
+ return PTR_ERR(sdcp->dcp_clk);
+ sdcp->dcp_clk = NULL;
+ }
+
+ ret = clk_prepare_enable(sdcp->dcp_clk);
+ if (ret)
+ return ret;
ret = devm_request_irq(dev, dcp_vmi_irq, mxs_dcp_irq, 0,
"dcp-vmi-irq", sdcp);
if (ret) {
dev_err(dev, "Failed to claim DCP VMI IRQ!\n");
@@ -1168,10 +1181,12 @@ static int mxs_dcp_remove(struct platform_device *pdev)
crypto_unregister_algs(dcp_aes_algs, ARRAY_SIZE(dcp_aes_algs));
kthread_stop(sdcp->thread[DCP_CHAN_HASH_SHA]);
kthread_stop(sdcp->thread[DCP_CHAN_CRYPTO]);
+ clk_disable_unprepare(sdcp->dcp_clk);
+
platform_set_drvdata(pdev, NULL);
global_sdcp = NULL;
return 0;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/4] crypto: mxs-dcp - Add support for dcp clk
2018-10-16 15:57 ` [PATCH v3 2/4] crypto: mxs-dcp - Add support for dcp clk Leonard Crestez
@ 2018-10-16 16:03 ` Fabio Estevam
2018-10-16 17:23 ` Leonard Crestez
0 siblings, 1 reply; 8+ messages in thread
From: Fabio Estevam @ 2018-10-16 16:03 UTC (permalink / raw)
To: Leonard Crestez
Cc: Shawn Guo, Fabio Estevam, Rob Herring, Marek Vasut, Herbert Xu,
Horia Geanta Neag, Franck LENORMAND, Aymen Sghaier,
David S. Miller, Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:HARDWARE RANDOM NUMBER GENERATOR CORE,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
NXP Linux Team, Sascha Hauer, linux-kernel
Hi Leonard,
On Tue, Oct 16, 2018 at 12:58 PM Leonard Crestez
<leonard.crestez@nxp.com> wrote:
> + /* DCP clock is optional, only used on some SOCs */
> + sdcp->dcp_clk = devm_clk_get(dev, "dcp");
> + if (IS_ERR(sdcp->dcp_clk)) {
> + if (sdcp->dcp_clk != ERR_PTR(-ENOENT))
> + return PTR_ERR(sdcp->dcp_clk);
> + sdcp->dcp_clk = NULL;
This dcp_clk assignment to NULL does not seem to be necessary.
> +
> + ret = clk_prepare_enable(sdcp->dcp_clk);
> + if (ret)
> + return ret;
>
> ret = devm_request_irq(dev, dcp_vmi_irq, mxs_dcp_irq, 0,
> "dcp-vmi-irq", sdcp);
> if (ret) {
> dev_err(dev, "Failed to claim DCP VMI IRQ!\n");
In case of subsequent errors you should call
clk_disable_unprepare(sdcp->dcp_clk).
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/4] crypto: mxs-dcp - Add support for dcp clk
2018-10-16 16:03 ` Fabio Estevam
@ 2018-10-16 17:23 ` Leonard Crestez
0 siblings, 0 replies; 8+ messages in thread
From: Leonard Crestez @ 2018-10-16 17:23 UTC (permalink / raw)
To: festevam
Cc: dl-linux-imx, linux-kernel, robh+dt, devicetree, Fabio Estevam,
Aymen Sghaier, Franck Lenormand, mark.rutland, shawnguo,
linux-arm-kernel, davem, Horia Geanta, kernel, herbert,
marek.vasut, linux-crypto
On Tue, 2018-10-16 at 13:03 -0300, Fabio Estevam wrote:
> > + /* DCP clock is optional, only used on some SOCs */
> > + sdcp->dcp_clk = devm_clk_get(dev, "dcp");
> > + if (IS_ERR(sdcp->dcp_clk)) {
> > + if (sdcp->dcp_clk != ERR_PTR(-ENOENT))
> > + return PTR_ERR(sdcp->dcp_clk);
> > + sdcp->dcp_clk = NULL;
>
> This dcp_clk assignment to NULL does not seem to be necessary.
The clk API ignores all calls if clk == NULL (which is very nice) but
not if IS_ERR(clk). Setting dcp_clk to NULL avoids sprinkling other
checks.
> > + ret = clk_prepare_enable(sdcp->dcp_clk);
> > + if (ret)
> > + return ret;
> >
> > ret = devm_request_irq(dev, dcp_vmi_irq, mxs_dcp_irq, 0,
> > "dcp-vmi-irq", sdcp);
> > if (ret) {
> > dev_err(dev, "Failed to claim DCP VMI IRQ!\n");
>
> In case of subsequent errors you should call
> clk_disable_unprepare(sdcp->dcp_clk).
Yes, will resend. Maybe some day clk consumer will automatically undo
pending prepare/enables on release?
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 3/4] ARM: dts: imx6ull: Add dcp node
2018-10-16 15:57 [PATCH v3 0/4] Port mxs-dcp to imx6ull and imx6sll Leonard Crestez
2018-10-16 15:57 ` [PATCH v3 1/4] dt-bindings: crypto: Mention clocks for mxs-dcp Leonard Crestez
2018-10-16 15:57 ` [PATCH v3 2/4] crypto: mxs-dcp - Add support for dcp clk Leonard Crestez
@ 2018-10-16 15:57 ` Leonard Crestez
2018-10-16 16:04 ` Fabio Estevam
2018-10-16 15:57 ` [PATCH v3 4/4] ARM: imx_v6_v7_defconfig: Enable CRYPTO_DEV_MXS_DCP Leonard Crestez
3 siblings, 1 reply; 8+ messages in thread
From: Leonard Crestez @ 2018-10-16 15:57 UTC (permalink / raw)
To: Shawn Guo, Fabio Estevam
Cc: Rob Herring, Marek Vasut, Herbert Xu, Horia Geanta,
Franck Lenormand, Aymen Sghaier, David S . Miller ,
Mark Rutland, devicetree, linux-crypto, linux-arm-kernel,
dl-linux-imx, kernel, linux-kernel
The DCP block on 6ull has no major differences other than requiring
explicit clock enabling.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
---
arch/arm/boot/dts/imx6ull.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index 796ed35d4ac9..f3668fe69eac 100644
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -37,10 +37,20 @@
#address-cells = <1>;
#size-cells = <1>;
reg = <0x02200000 0x100000>;
ranges;
+ dcp: crypto@2280000 {
+ compatible = "fsl,imx6ull-dcp", "fsl,imx28-dcp";
+ reg = <0x02280000 0x4000>;
+ interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX6ULL_CLK_DCP_CLK>;
+ clock-names = "dcp";
+ };
+
iomuxc_snvs: iomuxc-snvs@2290000 {
compatible = "fsl,imx6ull-iomuxc-snvs";
reg = <0x02290000 0x4000>;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 3/4] ARM: dts: imx6ull: Add dcp node
2018-10-16 15:57 ` [PATCH v3 3/4] ARM: dts: imx6ull: Add dcp node Leonard Crestez
@ 2018-10-16 16:04 ` Fabio Estevam
0 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2018-10-16 16:04 UTC (permalink / raw)
To: Leonard Crestez
Cc: Shawn Guo, Fabio Estevam, Rob Herring, Marek Vasut, Herbert Xu,
Horia Geanta Neag, Franck LENORMAND, Aymen Sghaier,
David S. Miller, Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:HARDWARE RANDOM NUMBER GENERATOR CORE,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
NXP Linux Team, Sascha Hauer, linux-kernel
On Tue, Oct 16, 2018 at 12:59 PM Leonard Crestez
<leonard.crestez@nxp.com> wrote:
>
> The DCP block on 6ull has no major differences other than requiring
> explicit clock enabling.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/4] ARM: imx_v6_v7_defconfig: Enable CRYPTO_DEV_MXS_DCP
2018-10-16 15:57 [PATCH v3 0/4] Port mxs-dcp to imx6ull and imx6sll Leonard Crestez
` (2 preceding siblings ...)
2018-10-16 15:57 ` [PATCH v3 3/4] ARM: dts: imx6ull: Add dcp node Leonard Crestez
@ 2018-10-16 15:57 ` Leonard Crestez
3 siblings, 0 replies; 8+ messages in thread
From: Leonard Crestez @ 2018-10-16 15:57 UTC (permalink / raw)
To: Shawn Guo, Fabio Estevam
Cc: Rob Herring, Marek Vasut, Herbert Xu, Horia Geanta,
Franck Lenormand, Aymen Sghaier, David S . Miller ,
Mark Rutland, devicetree, linux-crypto, linux-arm-kernel,
dl-linux-imx, kernel, linux-kernel
This block is present in 6sl, 6sll and 6ull so it should be enabled in
the default imx kernel config.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
arch/arm/configs/imx_v6_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 1ad5736c8fa6..57928dff9bce 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -428,10 +428,11 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_UTF8=y
CONFIG_SECURITYFS=y
CONFIG_CRYPTO_DEV_FSL_CAAM=y
CONFIG_CRYPTO_DEV_SAHARA=y
+CONFIG_CRYPTO_DEV_MXS_DCP=y
CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_FONTS=y
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread