crypto: Allwinner D1 crypto support
Subsystems (5)
Samuel Holland
maintainerv2 cover crypto: Allwinner D1 crypto support
This series finishes adding crypto support for the Allwinner D1 SoC. The driver patch from v1 was merged, but not the binding[1]. This turned out to be a good thing, because I later found that the TRNG needed another clock reference in the devicetree. That is fixed in v2. I include the DT update here too, since the SoC DT has been on the list for a while[2].
[1]: https://lore.kernel.org/all/[email protected]/T/
[2]: https://lore.kernel.org/lkml/[email protected]/
Changes in v2:
- Add TRNG clock
Samuel Holland (3):
dt-bindings: crypto: sun8i-ce: Add compatible for D1
crypto: sun8i-ce - Add TRNG clock to the D1 variant
riscv: dts: allwinner: d1: Add crypto engine node
.../bindings/crypto/allwinner,sun8i-ce.yaml | 33 ++++++++++++++----- .../boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 +++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 1 + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +- 4 files changed, 39 insertions(+), 9 deletions(-)
Signature · 1 line
2.37.4
Samuel Holland
maintainerPATCH v2 1/3 dt-bindings: crypto: sun8i-ce: Add compatible for D1
D1 has a crypto engine similar to the one in other Allwinner SoCs. Like H6, it has a separate MBUS clock gate.
It also requires the internal RC oscillator to be enabled for the TRNG to return data, presumably because noise from the oscillator is used as an entropy source. This is likely the case for earlier variants as well, but it really only matters for H616 and newer SoCs, as H6 provides no way to disable the internal oscillator.
---
I noticed that the vendor driver has code to explicitly enable IOSC when using the TRNG on A83T (search SS_TRNG_OSC_ADDR), but that is covered by a different binding/driver in mainline.
Changes in v2:
- Add TRNG clock
.../bindings/crypto/allwinner,sun8i-ce.yaml | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml +25 -8
@@ -14,6 +14,7 @@ properties: enum: - allwinner,sun8i-h3-crypto - allwinner,sun8i-r40-crypto + - allwinner,sun20i-d1-crypto - allwinner,sun50i-a64-crypto - allwinner,sun50i-h5-crypto - allwinner,sun50i-h6-crypto
@@ -29,6 +30,7 @@ properties: - description: Bus clock - description: Module clock - description: MBus clock + - description: TRNG clock (RC oscillator) minItems: 2 clock-names:
@@ -36,6 +38,7 @@ properties: - const: bus - const: mod - const: ram + - const: trng minItems: 2 resets:
@@ -44,19 +47,33 @@ properties: if: properties: compatible: - const: allwinner,sun50i-h6-crypto + enum: + - allwinner,sun20i-d1-crypto then: properties: clocks: - minItems: 3 + minItems: 4 clock-names: - minItems: 3 + minItems: 4 else: - properties: - clocks: - maxItems: 2 - clock-names: - maxItems: 2 + if: + properties: + compatible: + const: allwinner,sun50i-h6-crypto + then: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + minItems: 3 + maxItems: 3 + else: + properties: + clocks: + maxItems: 2 + clock-names: + maxItems: 2 required: - compatible
Signature · 1 line
2.37.4
Re: [PATCH v2 1/3] dt-bindings: crypto: sun8i-ce: Add compatible for D1
Quoted 11 lines · Samuel Holland
D1 has a crypto engine similar to the one in other Allwinner SoCs. Like H6, it has a separate MBUS clock gate.
It also requires the internal RC oscillator to be enabled for the TRNG to return data, presumably because noise from the oscillator is used as an entropy source. This is likely the case for earlier variants as well, but it really only matters for H616 and newer SoCs, as H6 provides no way to disable the internal oscillator.
Signed-off-by Samuel Holland <[email protected]>---
Best regards,
Krzysztof
Re: [PATCH v2 1/3] dt-bindings: crypto: sun8i-ce: Add compatible for D1
In reply to Samuel HollandQuoted 15 lines · Samuel Holland
D1 has a crypto engine similar to the one in other Allwinner SoCs. Like H6, it has a separate MBUS clock gate.
It also requires the internal RC oscillator to be enabled for the TRNG to return data, presumably because noise from the oscillator is used as an entropy source. This is likely the case for earlier variants as well, but it really only matters for H616 and newer SoCs, as H6 provides no way to disable the internal oscillator.
Signed-off-by Samuel Holland <[email protected]>---
I noticed that the vendor driver has code to explicitly enable IOSC when using the TRNG on A83T (searchSS_TRNG_OSC_ADDR), but that is covered by a different binding/driver in mainline.
Quoted 6 lines
Changes in v2:
- Add TRNG clock.../bindings/crypto/allwinner,sun8i-ce.yaml | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-)
Thanks
Herbert Xu
maintainerRe: [PATCH v2 1/3] dt-bindings: crypto: sun8i-ce: Add compatible for D1
In reply to Samuel HollandQuoted 15 lines · Samuel Holland
D1 has a crypto engine similar to the one in other Allwinner SoCs. Like H6, it has a separate MBUS clock gate.
It also requires the internal RC oscillator to be enabled for the TRNG to return data, presumably because noise from the oscillator is used as an entropy source. This is likely the case for earlier variants as well, but it really only matters for H616 and newer SoCs, as H6 provides no way to disable the internal oscillator.
Signed-off-by Samuel Holland <[email protected]>---
I noticed that the vendor driver has code to explicitly enable IOSC when using the TRNG on A83T (searchSS_TRNG_OSC_ADDR), but that is covered by a different binding/driver in mainline.
Quoted 5 lines
Changes in v2:
- Add TRNG clock.../bindings/crypto/allwinner,sun8i-ce.yaml | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-)
This doesn't have an ack from Rob Herring. Would you like me to apply just the crypto patch by itself?
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
Re: [PATCH v2 1/3] dt-bindings: crypto: sun8i-ce: Add compatible for D1
Quoted 16 lines · Herbert Xu
Quoted 15 lines · Samuel Holland
D1 has a crypto engine similar to the one in other Allwinner SoCs. Like H6, it has a separate MBUS clock gate.
It also requires the internal RC oscillator to be enabled for the TRNG to return data, presumably because noise from the oscillator is used as an entropy source. This is likely the case for earlier variants as well, but it really only matters for H616 and newer SoCs, as H6 provides no way to disable the internal oscillator.
Signed-off-by Samuel Holland <[email protected]>---
I noticed that the vendor driver has code to explicitly enable IOSC when using the TRNG on A83T (searchSS_TRNG_OSC_ADDR), but that is covered by a different binding/driver in mainline.
Quoted 8 lines
Quoted 5 lines
Changes in v2:
- Add TRNG clock.../bindings/crypto/allwinner,sun8i-ce.yaml | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-)This doesn't have an ack from Rob Herring. Would you like me to apply just the crypto patch by itself?
But it has my Reviewed-by, which is equivalent. Please take it via crypto with the driver change.
Best regards,
Krzysztof
Herbert Xu
maintainerRe: [PATCH v2 1/3] dt-bindings: crypto: sun8i-ce: Add compatible for D1
Quoted 3 lines · Krzysztof Kozlowski
But it has my Reviewed-by, which is equivalent. Please take it via crypto with the driver change.
Thanks for the clarification. I'll take patches 1+2 then. Patch 3 doesn't apply to cryptodev as the file doesn't exist in my tree.
Cheers,
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
Samuel Holland
maintainerPATCH v2 2/3 crypto: sun8i-ce - Add TRNG clock to the D1 variant
In reply to Samuel HollandAt least the D1 variant requires a separate clock for the TRNG. Without this clock enabled, reading from /dev/hwrng reports:
sun8i-ce 3040000.crypto: DMA timeout for TRNG (tm=96) on flow 3
Experimentation shows that the necessary clock is the SoC's internal RC oscillator. This makes sense, as noise from the oscillator can be used as a source of entropy.
---
Changes in v2:
- New patch for v2
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 1 + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +1 -0
@@ -118,6 +118,7 @@ static const struct ce_variant ce_d1_variant = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 }, { "ram", 0, 400000000 }, + { "trng", 0, 0 }, }, .esr = ESR_D1, .prng = CE_ALG_PRNG,
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +1 -1
@@ -105,7 +105,7 @@#define MAX_SG 8 -#define CE_MAX_CLOCKS 3 +#define CE_MAX_CLOCKS 4#define MAXFLOW 4
Signature · 1 line
2.37.4
Re: [PATCH v2 2/3] crypto: sun8i-ce - Add TRNG clock to the D1 variant
Dne sobota, 31. december 2022 ob 23:01:44 CET je Samuel Holland napisal(a):
Quoted 10 lines
At least the D1 variant requires a separate clock for the TRNG. Without this clock enabled, reading from
/dev/hwrngreports:sun8i-ce 3040000.crypto: DMA timeout for TRNG (tm=96) on flow 3
Experimentation shows that the necessary clock is the SoC's internal RC oscillator. This makes sense, as noise from the oscillator can be used as a source of entropy.
Signed-off-by Samuel Holland <[email protected]>
Best regards,
Jernej
Re: [PATCH v2 2/3] crypto: sun8i-ce - Add TRNG clock to the D1 variant
In reply to Samuel HollandQuoted 12 lines · Samuel Holland
At least the D1 variant requires a separate clock for the TRNG. Without this clock enabled, reading from
/dev/hwrngreports:sun8i-ce 3040000.crypto: DMA timeout for TRNG (tm=96) on flow 3
Experimentation shows that the necessary clock is the SoC's internal RC oscillator. This makes sense, as noise from the oscillator can be used as a source of entropy.
Signed-off-by Samuel Holland <[email protected]>---
Thanks
Samuel Holland
maintainerPATCH v2 3/3 riscv: dts: allwinner: d1: Add crypto engine node
In reply to Samuel HollandD1 contains a crypto engine which is supported by the sun8i-ce driver.
---
Changes in v2:
- New patch for v2
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +12 -0
@@ -378,6 +378,18 @@ sid: efuse@3006000 { #size-cells = <1>; }; + crypto: crypto@3040000 { + compatible = "allwinner,sun20i-d1-crypto"; + reg = <0x3040000 0x800>; + interrupts = <SOC_PERIPHERAL_IRQ(52) 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>; + }; + mbus: dram-controller@3102000 { compatible = "allwinner,sun20i-d1-mbus"; reg = <0x3102000 0x1000>,
Signature · 1 line
2.37.4
Re: [PATCH v2 3/3] riscv: dts: allwinner: d1: Add crypto engine node
Dne sobota, 31. december 2022 ob 23:01:45 CET je Samuel Holland napisal(a):
Quoted 3 lines
D1 contains a crypto engine which is supported by the sun8i-ce driver.
Signed-off-by Samuel Holland <[email protected]>
Best regards,
Jernej
Re: [PATCH v2 3/3] riscv: dts: allwinner: d1: Add crypto engine node
In reply to Samuel HollandQuoted 24 lines · On Sat, 31 Dec 2022 14:01:45 PST (-0800), [email protected] wrote:
D1 contains a crypto engine which is supported by the sun8i-ce driver.
Signed-off-by Samuel Holland <[email protected]>---
Changes in v2:
- New patch for v2arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +5
-0@@ -378,6 +378,18 @@ sid: efuse@3006000 { #size-cells = <1>; }; + crypto: crypto@3040000 { + compatible = "allwinner,sun20i-d1-crypto"; + reg = <0x3040000 0x800>; + interrupts = <SOC_PERIPHERAL_IRQ(52) IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CE>,
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi sid: efuse@3006000 { · line 395
Quoted 10 lines
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +7
-0+ <&ccu CLK_CE>, + <&ccu CLK_MBUS_CE>, + <&rtc CLK_IOSC>; + clock-names = "bus", "mod", "ram", "trng"; + resets = <&ccu RST_BUS_CE>; + }; + mbus: dram-controller@3102000 { compatible = "allwinner,sun20i-d1-mbus"; reg = <0x3102000 0x1000>,
Re: [PATCH v2 3/3] riscv: dts: allwinner: d1: Add crypto engine node
In reply to Samuel HollandDne sobota, 31. december 2022 ob 23:01:45 CET je Samuel Holland napisal(a):
Quoted 3 lines
D1 contains a crypto engine which is supported by the sun8i-ce driver.
Signed-off-by Samuel Holland <[email protected]>
Applied patch 3, thanks!
Best regards,
Jernej
Herbert Xu
maintainerQuoted 17 lines · Samuel Holland
This series finishes adding crypto support for the Allwinner D1 SoC. The driver patch from v1 was merged, but not the binding[1]. This turned out to be a good thing, because I later found that the TRNG needed another clock reference in the devicetree. That is fixed in v2. I include the DT update here too, since the SoC DT has been on the list for a while[2].
[1]: https://lore.kernel.org/all/[email protected]/T/
[2]: https://lore.kernel.org/lkml/[email protected]/Changes in v2:
- Add TRNG clockSamuel Holland (3):
dt-bindings: crypto: sun8i-ce: Add compatible for D1
crypto: sun8i-ce - Add TRNG clock to the D1 variant
riscv: dts: allwinner: d1: Add crypto engine node
Quoted 8 lines
.../bindings/crypto/allwinner,sun8i-ce.yaml | 33 ++++++++++++++----- .../boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 +++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 1 + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +- 4 files changed, 39 insertions(+), 9 deletions(-)Signature · 1 line
2.37.4
Patches 1-2 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