crypto: sun8i-ce: add Allwinner H616 support
Subsystems (4)
v2 cover crypto: sun8i-ce: add Allwinner H616 support
This is an update to the H616 crypto engine support, with the sparse warning fixed and the accrued tags added.
========================
This series adds support for the crypto engine in the Allwinner H616 SoC. The IP and its capabilities are very similar to the H6, with the major difference of the DMA engine supporting 34 bit wide addresses. This is achieved by just shifting every address by 2 bits in the DMA descriptors; Allwinner calls this "word addresses".
Patch 2/4 adds support for this by wrapping every address access in a function that does the shift as needed. Patch 1/4 adds the new compatible string to the binding, patch 3/4 adds that string to the driver and enables the address shift for it. The final patch 4/4 adds the DT node to the SoC .dtsi. Since this is an internal peripheral, it's always enabled.
Corentin's cryptotest passed for me, though I haven't checked how fast it is and if it really brings an advantage performance-wise, but maybe people find it useful to offload that from the CPU cores. One immediate advantage is the availability of the TRNG device, which helps to feed the kernel's entropy pool much faster - typically before we reach userland. Without the driver this sometimes takes minutes, and delays workloads that rely on the entropy pool.
Please have a look and comment!
Cheers,
Andre
Changelog v1 ... v2:
- fix sparse warning by treating writel() call differently (2/4)
- add Acks, R-b and Tested-by: tags
Andre Przywara (4):
dt-bindings: crypto: sun8i-ce: Add compatible for H616
crypto: sun8i-ce - wrap accesses to descriptor address fields
crypto: sun8i-ce - add Allwinner H616 support
arm64: dts: allwinner: h616: add crypto engine node
.../bindings/crypto/allwinner,sun8i-ce.yaml | 2 ++ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 10 +++++++ .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 8 +++--- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 28 ++++++++++++++++++- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 6 ++-- .../crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 6 ++-- .../crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 2 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 15 ++++++++++ 8 files changed, 65 insertions(+), 12 deletions(-)
Signature · 1 line
2.39.4
PATCH v2 1/4 dt-bindings: crypto: sun8i-ce: Add compatible for H616
The Allwinner H616 has a crypto engine very similar to the one in the H6, although all addresses in the DMA descriptors are shifted by 2 bits, to accommodate for the larger physical address space. That makes it incompatible to the H6 variant, and thus requires a new compatible string. Clock wise it relies on the internal oscillator for the TRNG, so needs all four possible clocks specified.
Add the compatible string to the list of recognised names, and add the H616 to list of devices requiring all four clocks.
--- .../devicetree/bindings/crypto/allwinner,sun8i-ce.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml +2 -0
@@ -18,6 +18,7 @@ properties: - allwinner,sun50i-a64-crypto - allwinner,sun50i-h5-crypto - allwinner,sun50i-h6-crypto + - allwinner,sun50i-h616-crypto reg: maxItems: 1
@@ -49,6 +50,7 @@ if: compatible: enum: - allwinner,sun20i-d1-crypto + - allwinner,sun50i-h616-crypto then: properties: clocks:
Signature · 1 line
2.39.4
PATCH v2 2/4 crypto: sun8i-ce - wrap accesses to descriptor address fields
In reply to Andre PrzywaraThe Allwinner H616 (and later) SoCs support more than 32 bits worth of physical addresses. To accommodate the larger address space, the CE task descriptor fields holding addresses are now encoded as "word addresses", so take the actual address divided by four.
This is true for the fields within the descriptor, but also for the descriptor base address, in the CE_TDA register.
Wrap all accesses to those fields in a function, which will do the required division if needed. For now this in unused, so there should be no change in behaviour.
--- .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 8 ++++---- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 6 +++--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 6 +++--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 2 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 15 +++++++++++++++ 6 files changed, 27 insertions(+), 12 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +4 -4
@@ -190,7 +190,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req err = -EFAULT ; goto theend; } - cet->t_key =cpu_to_le32 (rctx->addr_key); + cet->t_key =desc_addr_val_le32 (ce, rctx->addr_key); ivsize =crypto_skcipher_ivsize (tfm);if (areq->iv &&crypto_skcipher_ivsize (tfm) >0 ) {
@@ -208,7 +208,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req err = -ENOMEM ; goto theend_iv; } - cet->t_iv =cpu_to_le32 (rctx->addr_iv); + cet->t_iv =desc_addr_val_le32 (ce, rctx->addr_iv); }if (areq->src == areq->dst) {
@@ -236,7 +236,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req len = areq->cryptlen;for_each_sg (areq->src, sg, nr_sgs, i) { - cet->t_src[i].addr =cpu_to_le32 (sg_dma_address (sg)); + cet->t_src[i].addr =desc_addr_val_le32 (ce,sg_dma_address (sg)); todo =min (len,sg_dma_len (sg)); cet->t_src[i].len =cpu_to_le32 (todo /4 ); dev_dbg(ce->dev, "%s total=%u SG(%d %u off=%d) todo=%u\n", __func__,
@@ -251,7 +251,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req len = areq->cryptlen;for_each_sg (areq->dst, sg, nr_sgd, i) { - cet->t_dst[i].addr =cpu_to_le32 (sg_dma_address (sg)); + cet->t_dst[i].addr =desc_addr_val_le32 (ce,sg_dma_address (sg)); todo =min (len,sg_dma_len (sg)); cet->t_dst[i].len =cpu_to_le32 (todo /4 ); dev_dbg(ce->dev, "%s total=%u SG(%d %u off=%d) todo=%u\n", __func__,
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +1 -1
@@ -172,7 +172,7 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name)writel (v, ce->base +CE_ICR );reinit_completion (&ce->chanlist[flow].complete); -writel (ce->chanlist[flow].t_phy, ce->base +CE_TDQ ); +writel (desc_addr_val (ce, ce->chanlist[flow].t_phy), ce->base +CE_TDQ ); ce->chanlist[flow].status =0 ;/* Be sure all data is written before enabling the task */
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +3 -3
@@ -403,7 +403,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) len = areq->nbytes;for_each_sg (areq->src, sg, nr_sgs, i) { - cet->t_src[i].addr =cpu_to_le32 (sg_dma_address (sg)); + cet->t_src[i].addr =desc_addr_val_le32 (ce,sg_dma_address (sg)); todo =min (len,sg_dma_len (sg)); cet->t_src[i].len =cpu_to_le32 (todo /4 ); len -= todo;
@@ -414,7 +414,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) goto theend; } addr_res =dma_map_single (ce->dev, result, digestsize,DMA_FROM_DEVICE ); - cet->t_dst[0 ].addr =cpu_to_le32 (addr_res); + cet->t_dst[0 ].addr =desc_addr_val_le32 (ce, addr_res); cet->t_dst[0 ].len =cpu_to_le32 (digestsize /4 );if (dma_mapping_error (ce->dev, addr_res)) {dev_err (ce->dev,"DMA map dest\n" );
@@ -445,7 +445,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq) } addr_pad =dma_map_single (ce->dev, buf, j *4 ,DMA_TO_DEVICE ); - cet->t_src[i].addr =cpu_to_le32 (addr_pad); + cet->t_src[i].addr =desc_addr_val_le32 (ce, addr_pad); cet->t_src[i].len =cpu_to_le32 (j);if (dma_mapping_error (ce->dev, addr_pad)) {dev_err (ce->dev,"DMA error on padding SG\n" );
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c +3 -3
@@ -132,10 +132,10 @@ int sun8i_ce_prng_generate(struct crypto_rng *tfm, const u8 *src, cet->t_sym_ctl =cpu_to_le32 (sym); cet->t_asym_ctl =0 ; - cet->t_key =cpu_to_le32 (dma_iv); - cet->t_iv =cpu_to_le32 (dma_iv); + cet->t_key =desc_addr_val_le32 (ce, dma_iv); + cet->t_iv =desc_addr_val_le32 (ce, dma_iv); - cet->t_dst[0 ].addr =cpu_to_le32 (dma_dst); + cet->t_dst[0 ].addr =desc_addr_val_le32 (ce, dma_dst); cet->t_dst[0 ].len =cpu_to_le32 (todo /4 ); ce->chanlist[flow].timeout =2000 ;
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c +1 -1
@@ -77,7 +77,7 @@ static int sun8i_ce_trng_read(struct hwrng *rng, void *data, size_t max, bool wa cet->t_sym_ctl =0 ; cet->t_asym_ctl =0 ; - cet->t_dst[0 ].addr =cpu_to_le32 (dma_dst); + cet->t_dst[0 ].addr =desc_addr_val_le32 (ce, dma_dst); cet->t_dst[0 ].len =cpu_to_le32 (todo /4 ); ce->chanlist[flow].timeout = todo;
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +15 -0
@@ -149,6 +149,7 @@ struct ce_variant {bool hash_t_dlen_in_bits;bool prng_t_dlen_in_bytes;bool trng_t_dlen_in_bytes; +bool needs_word_addresses;struct ce_clock ce_clks[CE_MAX_CLOCKS ];int esr;unsigned char prng;
@@ -241,6 +242,20 @@ struct sun8i_ce_dev {#endif }; +static inline u32 desc_addr_val (struct sun8i_ce_dev *dev,dma_addr_t addr) +{ +if (dev->variant->needs_word_addresses) +return addr /4 ; + +return addr; +} + +static inline __le32 desc_addr_val_le32 (struct sun8i_ce_dev *dev, +dma_addr_t addr) +{ +return cpu_to_le32 (desc_addr_val (dev, addr)); +} +/* * struct sun8i_cipher_req_ctx - context for a skcipher request * @op_dir: direction (encrypt vs decrypt) for this request
Signature · 1 line
2.39.4
Re: [PATCH v2 2/4] crypto: sun8i-ce - wrap accesses to descriptor address fields
Quoted 8 lines · Andre Przywara
The Allwinner H616 (and later) SoCs support more than 32 bits worth of physical addresses. To accommodate the larger address space, the CE task descriptor fields holding addresses are now encoded as "word addresses", so take the actual address divided by four.
This is true for the fields within the descriptor, but also for the descriptor base address, in theCE_TDAregister.
Quoted 5 lines
Wrap all accesses to those fields in a function, which will do the required division if needed. For now this in unused, so there should be no change in behaviour.
Signed-off-by Andre Przywara <[email protected]>
PATCH v2 3/4 crypto: sun8i-ce - add Allwinner H616 support
In reply to Andre PrzywaraThe crypto engine in the Allwinner H616 is very similar to the H6, but needs the base address for the task descriptor and the addresses within it to be expressed in words, not in bytes.
Add a new variant struct entry for the H616, and set the new flag to mark the use of 34 bit addresses. Also the internal 32K oscillator is required for TRNG operation, so specify all four clocks.
--- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +26 -0
@@ -92,6 +92,30 @@ static const struct ce_variant ce_h6_variant = { .trng = CE_ALG_TRNG_V2, }; +static const struct ce_variant ce_h616_variant = { + .alg_cipher = {CE_ALG_AES ,CE_ALG_DES ,CE_ALG_3DES , + }, + .alg_hash = {CE_ALG_MD5 ,CE_ALG_SHA1 ,CE_ALG_SHA224 ,CE_ALG_SHA256 , +CE_ALG_SHA384 ,CE_ALG_SHA512 + }, + .op_mode = {CE_OP_ECB ,CE_OP_CBC + }, + .cipher_t_dlen_in_bytes = true, + .hash_t_dlen_in_bits = true, + .prng_t_dlen_in_bytes = true, + .trng_t_dlen_in_bytes = true, + .needs_word_addresses = true, + .ce_clks = { + {"bus" ,0 ,200000000 }, + {"mod" ,300000000 ,0 }, + {"ram" ,0 ,400000000 }, + {"trng" ,0 ,0 }, + }, + .esr =ESR_H6 , + .prng =CE_ALG_PRNG_V2 , + .trng =CE_ALG_TRNG_V2 , +}; +static const struct ce_variant ce_a64_variant = { .alg_cipher = {CE_ALG_AES ,CE_ALG_DES ,CE_ALG_3DES , },
@@ -1097,6 +1121,8 @@ static const struct of_device_id sun8i_ce_crypto_of_match_table[] = { .data = &ce_h5_variant }, { .compatible = "allwinner,sun50i-h6-crypto", .data = &ce_h6_variant }, + { .compatible = "allwinner,sun50i-h616-crypto", + .data = &ce_h616_variant }, {} };MODULE_DEVICE_TABLE (of, sun8i_ce_crypto_of_match_table);
Signature · 1 line
2.39.4
PATCH v2 4/4 arm64: dts: allwinner: h616: add crypto engine node
In reply to Andre PrzywaraThe Allwinner H616 SoC contains a crypto engine very similar to the H6 version, but with all base addresses in the DMA descriptors shifted by two bits. This requires a new compatible string.
Also the H616 CE relies on the internal osciallator for the TRNG operation, so we need to reference this clock.
--- arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +10 -0
@@ -113,6 +113,16 @@ soc { #size-cells = <1>; ranges = <0x0 0x0 0x0 0x40000000>; + crypto: crypto@1904000 { + compatible = "allwinner,sun50i-h616-crypto"; + reg = <0x01904000 0x1000>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>, + <&ccu CLK_MBUS_CE>, <&rtc CLK_IOSC>; + clock-names = "bus", "mod", "ram", "trng"; + resets = <&ccu RST_BUS_CE>; + }; + syscon: syscon@3000000 { compatible = "allwinner,sun50i-h616-system-control"; reg = <0x03000000 0x1000>;
Signature · 1 line
2.39.4
Re: [PATCH v2 4/4] arm64: dts: allwinner: h616: add crypto engine node
Quoted 17 lines · Andre Przywara
The Allwinner H616 SoC contains a crypto engine very similar to the H6 version, but with all base addresses in the DMA descriptors shifted by two bits. This requires a new compatible string.
Also the H616 CE relies on the internal osciallator for the TRNG operation, so we need to reference this clock.Signed-off-by Andre Przywara <[email protected]>--- arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +0
-0
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi soc { · line 118
Quoted 6 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +3
-0@@ -113,6 +113,16 @@ soc { #size-cells = <1>; ranges = <0x0 0x0 0x0 0x40000000>; + crypto: crypto@1904000 { + compatible = "allwinner,sun50i-h616-crypto"; + reg = <0x01904000 0x1000>;
The address range only goes up to 0x019047ff. The other half is the secure crypto engine. The other bits look correct.
I can fix this up when applying, assuming the driver parts get merged in the next few days.
Chenyu
Quoted 13 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +7
-1+ interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>, + <&ccu CLK_MBUS_CE>, <&rtc CLK_IOSC>; + clock-names = "bus", "mod", "ram", "trng"; + resets = <&ccu RST_BUS_CE>; + }; + syscon: syscon@3000000 { compatible = "allwinner,sun50i-h616-system-control"; reg = <0x03000000 0x1000>; --2.39.4
Re: [PATCH v2 4/4] arm64: dts: allwinner: h616: add crypto engine node
On Fri, 28 Jun 2024 01:54:00 +0800
Chen-Yu Tsai <[email protected]> wrote:
Hi Chen-Yu,
Quoted 21 lines · Andre Przywara
Quoted 20 lines
The Allwinner H616 SoC contains a crypto engine very similar to the H6 version, but with all base addresses in the DMA descriptors shifted by two bits. This requires a new compatible string.
Also the H616 CE relies on the internal osciallator for the TRNG operation, so we need to reference this clock.Signed-off-by Andre Przywara <[email protected]>--- arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +0
-0@@ -113,6 +113,16 @@ soc { #size-cells = <1>; ranges = <0x0 0x0 0x0 0x40000000>;
Quoted 6 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi soc { · line 118
Quoted 3 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +3
-0+ crypto: crypto@1904000 { + compatible = "allwinner,sun50i-h616-crypto"; + reg = <0x01904000 0x1000>;The address range only goes up to
0x019047ff. The other half is the secure crypto engine. The other bits look correct.
You are right, the manual restricts CE_NS to 0x019047ff, and we certainly use much less registers than that anyway. So good catch!
Quoted 2 lines
I can fix this up when applying, assuming the driver parts get merged in the next few days.
Many thanks, I'd be very grateful if you could fix this up!
Cheers,
Andre
Quoted 16 lines
Chenyu
Quoted 13 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +7
-1+ interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>, + <&ccu CLK_MBUS_CE>, <&rtc CLK_IOSC>; + clock-names = "bus", "mod", "ram", "trng"; + resets = <&ccu RST_BUS_CE>; + }; + syscon: syscon@3000000 { compatible = "allwinner,sun50i-h616-system-control"; reg = <0x03000000 0x1000>; --2.39.4
Herbert Xu
maintainerQuoted 39 lines · Andre Przywara
This is an update to the H616 crypto engine support, with the sparse warning fixed and the accrued tags added.
========================This series adds support for the crypto engine in the Allwinner H616 SoC. The IP and its capabilities are very similar to the H6, with the major difference of the DMA engine supporting 34 bit wide addresses. This is achieved by just shifting every address by 2 bits in the DMA descriptors; Allwinner calls this "word addresses".
Patch 2/4 adds support for this by wrapping every address access in a function that does the shift as needed. Patch 1/4 adds the new compatible string to the binding, patch 3/4 adds that string to the driver and enables the address shift for it. The final patch 4/4 adds the DT node to the SoC .dtsi. Since this is an internal peripheral, it's always enabled.Corentin's cryptotest passed for me, though I haven't checked how fast it is and if it really brings an advantage performance-wise, but maybe people find it useful to offload that from the CPU cores. One immediate advantage is the availability of the TRNG device, which helps to feed the kernel's entropy pool much faster - typically before we reach userland. Without the driver this sometimes takes minutes, and delays workloads that rely on the entropy pool.
Please have a look and comment!
Cheers,
AndreChangelog v1 ... v2:
- fix sparse warning by treatingwritel()call differently (2/4)
- add Acks, R-b and Tested-by: tagsAndre Przywara (4):
dt-bindings: crypto: sun8i-ce: Add compatible for H616
crypto: sun8i-ce - wrap accesses to descriptor address fields
crypto: sun8i-ce - add Allwinner H616 support
arm64: dts: allwinner: h616: add crypto engine node
Quoted 12 lines
.../bindings/crypto/allwinner,sun8i-ce.yaml | 2 ++ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 10 +++++++ .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 8 +++--- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 28 ++++++++++++++++++- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 6 ++-- .../crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 6 ++-- .../crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 2 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 15 ++++++++++ 8 files changed, 65 insertions(+), 12 deletions(-)Signature · 1 line
2.39.4
Patches 1-3 applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Chen-Yu Tsai
AppliedRe: (subset) [PATCH v2 0/4] crypto: sun8i-ce: add Allwinner H616 support
In reply to Andre PrzywaraQuoted 16 lines · Andre Przywara
This is an update to the H616 crypto engine support, with the sparse warning fixed and the accrued tags added.
========================This series adds support for the crypto engine in the Allwinner H616 SoC. The IP and its capabilities are very similar to the H6, with the major difference of the DMA engine supporting 34 bit wide addresses. This is achieved by just shifting every address by 2 bits in the DMA descriptors; Allwinner calls this "word addresses".
Patch 2/4 adds support for this by wrapping every address access in a function that does the shift as needed. Patch 1/4 adds the new compatible string to the binding, patch 3/4 adds that string to the driver and enables the address shift for it. The final patch 4/4 adds the DT node to the SoC .dtsi. Since this is an internal peripheral, it's always enabled.
Quoted 1 line
[...]
Applied to sunxi/dt-for-6.11 in sunxi/linux.git, thanks!
[4/4] arm64: dts: allwinner: h616: add crypto engine node
https://git.kernel.org/sunxi/linux/c/6ed9a85f1c44
Best regards,
Signature · 1 line
Chen-Yu Tsai <[email protected]>