Re: [PATCH v3] dt-bindings: crypto: convert rockchip-crypto to yaml

Johan Jonker
2022-02-15T14:08:06Z

Hi Heiko,

On 2/11/22 12:59, Corentin Labbe wrote:
> Convert rockchip-crypto to yaml
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> Changes since v1:
> - fixed example
> - renamed to a new name
> - fixed some maxItems
>
> Change since v2:
> - Fixed maintainers section
>
> .../crypto/rockchip,rk3288-crypto.yaml | 66 +++++++++++++++++++
> .../bindings/crypto/rockchip-crypto.txt | 28 --------
> 2 files changed, 66 insertions(+), 28 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml

rockchip,crypto.yaml

> delete mode 100644 Documentation/devicetree/bindings/crypto/rockchip-crypto.txt
>
> diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml
> new file mode 100644
> index 000000000000..2e1e9fa711c4
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml
> @@ -0,0 +1,66 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/crypto/rockchip,rk3288-crypto.yaml#

rockchip,crypto.yaml

> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Rockchip Electronics And Security Accelerator
> +
> +maintainers:
> + - Heiko Stuebner <heiko@sntech.de>
> +
> +properties:
> + compatible:

oneOf:
- const: rockchip,rk3288-crypto
- items:
- enum:
- rockchip,rk3228-crypto
- rockchip,rk3328-crypto
- rockchip,rk3368-crypto
- rockchip,rk3399-crypto
- const: rockchip,rk3288-crypto

rk3288 was the first in line that had support, so we use that as fall
back string.

> + const: rockchip,rk3288-crypto
> +
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + items:
> + - description: clock data
> + - description: clock data
> + - description: clock crypto accelerator

> + - description: clock dma

remove ???

> +
> + clock-names:
> + items:
> + - const: aclk
> + - const: hclk
> + - const: sclk

> + - const: apb_pclk

remove ???

Similar to the rk3568 pclk_xpcs discussion ACLK_DMAC1 belongs to the
dmac_bus_s node and should have been enabled by the DMA driver I think.
Could you advise if this is correct or should we remove parsing/enabling
ACLK_DMAC1 in rk3288_crypto.c in order to it easier
porting/adding/syncing nodes for other SoC types?

Johan

===

From rk3288.dtsi:

dmac_bus_s: dma-controller@ffb20000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x0 0xffb20000 0x0 0x4000>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
arm,pl330-broken-no-flushp;
arm,pl330-periph-burst;

clocks = <&cru ACLK_DMAC1>;

clock-names = "apb_pclk";
};

crypto: cypto@ff8a0000 {
compatible = "rockchip,rk3288-crypto";
reg = <0x0 0xff8a0000 0x0 0x4000>;
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,

<&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;

clock-names = "aclk", "hclk", "sclk", "apb_pclk";

resets = <&cru SRST_CRYPTO>;
reset-names = "crypto-rst";
};
===

https://github.com/rockchip-linux/u-boot/blob/next-dev/drivers/crypto/rockchip/crypto_v1.c

U-boot currently only looks for a SCLK_CRYPTO array and sets the
SCLK_CRYPTO frequency.

TODO:
Make it work/portable for all Rockchip SoC types in both Linux and
U-boot with variable number of clocks and resets.

rk322x.dtsi:

crypto: crypto@100a0000 {
compatible = "rockchip,rk3228-crypto", "rockchip,rk3288-crypto";
reg = <0x100a0000 0x10000>;
clocks = <&cru SCLK_CRYPTO>;
clock-names = "sclk_crypto";
};

#define SRST_CRYPTO 53
#define HCLK_M_CRYPTO 476
#define HCLK_S_CRYPTO 477

#define SRST_CRYPTO 53

===
rk3328.dtsi:

crypto: crypto@ff060000 {
compatible = "rockchip,rk3328-crypto", "rockchip,rk3288-crypto";
reg = <0x0 0xff060000 0x0 0x10000>;
clocks = <&cru SCLK_CRYPTO>;
clock-names = "sclk_crypto";
};

#define SRST_CRYPTO 68
#define HCLK_CRYPTO_MST 336
#define HCLK_CRYPTO_SLV 337

#define SRST_CRYPTO 68

===
rk3368.dtsi:

crypto: crypto@ff8a0000 {
compatible = "rockchip,rk3368-crypto", "rockchip,rk3288-crypto";
reg = <0x0 0xff8a0000 0x0 0x10000>;
clocks = <&cru SCLK_CRYPTO>;
clock-names = "sclk_crypto";
};

#define SCLK_CRYPTO 130 ??? missing in rk3368-cru.h
#define MCLK_CRYPTO 191
#define HCLK_CRYPTO 461

#define SRST_CRYPTO 174

===
rk3399.dtsi:

crypto: crypto@ff8b0000 {
compatible = "rockchip,rk3399-crypto", "rockchip,rk3288-crypto";
reg = <0x0 0xff8b0000 0x0 0x10000>;
clocks = <&cru SCLK_CRYPTO0>, <&cru SCLK_CRYPTO1>;
clock-names = "sclk_crypto0", "sclk_crypto1";
};

#define SCLK_CRYPTO0 133
#define SCLK_CRYPTO1 134
#define HCLK_M_CRYPTO0 464
#define HCLK_M_CRYPTO1 465
#define HCLK_S_CRYPTO0 466
#define HCLK_S_CRYPTO1 467

#define SRST_CRYPTO_S 174
#define SRST_CRYPTO_M 175
#define SRST_CRYPTO 181
#define SRST_CRYPTO1_S 184
#define SRST_CRYPTO1_M 185
#define SRST_CRYPTO1 186

> +
> + resets:
> + maxItems: 1
> +
> + reset-names:
> + const: crypto-rst
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - clocks
> + - clock-names
> + - resets
> + - reset-names
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/clock/rk3288-cru.h>
> + crypto@ff8a0000 {
> + compatible = "rockchip,rk3288-crypto";
> + reg = <0xff8a0000 0x4000>;
> + interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
> + <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
> + clock-names = "aclk", "hclk", "sclk", "apb_pclk";
> + resets = <&cru SRST_CRYPTO>;
> + reset-names = "crypto-rst";
> + };
> diff --git a/Documentation/devicetree/bindings/crypto/rockchip-crypto.txt b/Documentation/devicetree/bindings/crypto/rockchip-crypto.txt
> deleted file mode 100644
> index 5e2ba385b8c9..000000000000
> --- a/Documentation/devicetree/bindings/crypto/rockchip-crypto.txt
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -Rockchip Electronics And Security Accelerator
> -
> -Required properties:
> -- compatible: Should be "rockchip,rk3288-crypto"
> -- reg: Base physical address of the engine and length of memory mapped
> - region
> -- interrupts: Interrupt number
> -- clocks: Reference to the clocks about crypto
> -- clock-names: "aclk" used to clock data
> - "hclk" used to clock data
> - "sclk" used to clock crypto accelerator
> - "apb_pclk" used to clock dma
> -- resets: Must contain an entry for each entry in reset-names.
> - See ../reset/reset.txt for details.
> -- reset-names: Must include the name "crypto-rst".
> -
> -Examples:
> -
> - crypto: cypto-controller@ff8a0000 {
> - compatible = "rockchip,rk3288-crypto";
> - reg = <0xff8a0000 0x4000>;
> - interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
> - <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
> - clock-names = "aclk", "hclk", "sclk", "apb_pclk";
> - resets = <&cru SRST_CRYPTO>;
> - reset-names = "crypto-rst";
> - };