]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: freescale: imx8qxp/imx8qm: Add CAAM support
authorHoria Geantă <horia.geanta@nxp.com>
Wed, 11 Jun 2025 11:38:09 +0000 (11:38 +0000)
committerShawn Guo <shawnguo@kernel.org>
Fri, 11 Jul 2025 08:34:30 +0000 (16:34 +0800)
The iMX8QXP and iMX8QM have a CAAM (Cryptographic Acceleration and
Assurance Module) like many other iMXs.

Add the definitions for it.

Job Rings 0 and 1 are bound to the SECO (Security Controller) ARM core
and are not exposed outside it. There's no point to define them in the
bindings as they cannot be used outside the SECO.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: John Ernberg <john.ernberg@actia.se>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/boot/dts/freescale/imx8-ss-security.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/freescale/imx8qm.dtsi
arch/arm64/boot/dts/freescale/imx8qxp-ss-security.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/freescale/imx8qxp.dtsi

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-security.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-security.dtsi
new file mode 100644 (file)
index 0000000..3e04142
--- /dev/null
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2019 NXP
+ */
+
+#include <dt-bindings/firmware/imx/rsrc.h>
+
+security_subsys: bus@31400000 {
+       compatible = "simple-bus";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges = <0x31400000 0x0 0x31400000 0x90000>;
+
+       crypto: crypto@31400000 {
+               compatible = "fsl,imx8qm-caam", "fsl,sec-v4.0";
+               reg = <0x31400000 0x90000>;
+               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x31400000 0x90000>;
+               power-domains = <&pd IMX_SC_R_CAAM_JR2>;
+               fsl,sec-era = <9>;
+
+               sec_jr2: jr@30000 {
+                       compatible = "fsl,imx8qm-job-ring", "fsl,sec-v4.0-job-ring";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH>;
+                       power-domains = <&pd IMX_SC_R_CAAM_JR2>;
+               };
+
+               sec_jr3: jr@40000 {
+                       compatible = "fsl,imx8qm-job-ring", "fsl,sec-v4.0-job-ring";
+                       reg = <0x40000 0x10000>;
+                       interrupts = <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH>;
+                       power-domains = <&pd IMX_SC_R_CAAM_JR3>;
+               };
+       };
+};
index 11527050ac8bd77986045c5eca0f62663f95f1cd..37babdbae8dd6932b6fd7de2178ff0ab5b508dd5 100644 (file)
        };
 
        /* sorted in register address */
+       #include "imx8-ss-security.dtsi"
        #include "imx8-ss-cm41.dtsi"
        #include "imx8-ss-audio.dtsi"
        #include "imx8-ss-vpu.dtsi"
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ss-security.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-ss-security.dtsi
new file mode 100644 (file)
index 0000000..15f1239
--- /dev/null
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2025 Actia Nordic AB
+ */
+
+&crypto {
+       compatible = "fsl,imx8qxp-caam", "fsl,sec-v4.0";
+};
+
+&sec_jr2 {
+       compatible = "fsl,imx8qxp-job-ring", "fsl,sec-v4.0-job-ring";
+};
+
+&sec_jr3 {
+       compatible = "fsl,imx8qxp-job-ring", "fsl,sec-v4.0-job-ring";
+};
index 05138326f0a572f45122f5ee425089f945fdc656..e2e799cc294cf73c5093cc11c806f16f4adce8a5 100644 (file)
        /* sorted in register address */
        #include "imx8-ss-img.dtsi"
        #include "imx8-ss-vpu.dtsi"
+       #include "imx8-ss-security.dtsi"
        #include "imx8-ss-cm40.dtsi"
        #include "imx8-ss-gpu0.dtsi"
        #include "imx8-ss-adma.dtsi"
 
 #include "imx8qxp-ss-img.dtsi"
 #include "imx8qxp-ss-vpu.dtsi"
+#include "imx8qxp-ss-security.dtsi"
 #include "imx8qxp-ss-adma.dtsi"
 #include "imx8qxp-ss-conn.dtsi"
 #include "imx8qxp-ss-lsio.dtsi"