Skip to content

Commit c434e25

Browse files
committed
Merge tag 'v6.11-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto update from Herbert Xu: "API: - Test setkey in no-SIMD context - Add skcipher speed test for user-specified algorithm Algorithms: - Add x25519 support on ppc64le - Add VAES and AVX512 / AVX10 optimized AES-GCM on x86 - Remove sm2 algorithm Drivers: - Add Allwinner H616 support to sun8i-ce - Use DMA in stm32 - Add Exynos850 hwrng support to exynos" * tag 'v6.11-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (81 commits) hwrng: core - remove (un)register_miscdev() crypto: lib/mpi - delete unnecessary condition crypto: testmgr - generate power-of-2 lengths more often crypto: mxs-dcp - Ensure payload is zero when using key slot hwrng: Kconfig - Do not enable by default CN10K driver crypto: starfive - Fix nent assignment in rsa dec crypto: starfive - Align rsa input data to 32-bit crypto: qat - fix unintentional re-enabling of error interrupts crypto: qat - extend scope of lock in adf_cfg_add_key_value_param() Documentation: qat: fix auto_reset attribute details crypto: sun8i-ce - add Allwinner H616 support crypto: sun8i-ce - wrap accesses to descriptor address fields dt-bindings: crypto: sun8i-ce: Add compatible for H616 hwrng: core - Fix wrong quality calculation at hw rng registration hwrng: exynos - Enable Exynos850 support hwrng: exynos - Add SMC based TRNG operation hwrng: exynos - Implement bus clock control hwrng: exynos - Use devm_clk_get_enabled() to get the clock hwrng: exynos - Improve coding style dt-bindings: rng: Add Exynos850 support to exynos-trng ...
2 parents 720261c + df1e979 commit c434e25

File tree

114 files changed

+5484
-5897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+5484
-5897
lines changed

Documentation/ABI/testing/sysfs-driver-qat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ Description:
143143
This attribute is only available for qat_4xxx devices.
144144

145145
What: /sys/bus/pci/devices/<BDF>/qat/auto_reset
146-
Date: March 2024
147-
KernelVersion: 6.8
146+
Date: May 2024
147+
KernelVersion: 6.9
148148
149149
Description: (RW) Reports the current state of the autoreset feature
150150
for a QAT device

Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- allwinner,sun50i-a64-crypto
1919
- allwinner,sun50i-h5-crypto
2020
- allwinner,sun50i-h6-crypto
21+
- allwinner,sun50i-h616-crypto
2122

2223
reg:
2324
maxItems: 1
@@ -49,6 +50,7 @@ if:
4950
compatible:
5051
enum:
5152
- allwinner,sun20i-d1-crypto
53+
- allwinner,sun50i-h616-crypto
5254
then:
5355
properties:
5456
clocks:

Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ properties:
2626
items:
2727
- const: core
2828

29+
power-domains:
30+
maxItems: 1
31+
2932
required:
3033
- compatible
3134
- reg

Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.yaml

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
const: samsung,exynos5250-trng
15+
enum:
16+
- samsung,exynos5250-trng
17+
- samsung,exynos850-trng
1618

1719
clocks:
18-
maxItems: 1
20+
minItems: 1
21+
maxItems: 2
1922

2023
clock-names:
21-
items:
22-
- const: secss
24+
minItems: 1
25+
maxItems: 2
2326

2427
reg:
2528
maxItems: 1
@@ -30,6 +33,35 @@ required:
3033
- clock-names
3134
- reg
3235

36+
allOf:
37+
- if:
38+
properties:
39+
compatible:
40+
contains:
41+
const: samsung,exynos850-trng
42+
43+
then:
44+
properties:
45+
clocks:
46+
items:
47+
- description: SSS (Security Sub System) operating clock
48+
- description: SSS (Security Sub System) bus clock
49+
50+
clock-names:
51+
items:
52+
- const: secss
53+
- const: pclk
54+
55+
else:
56+
properties:
57+
clocks:
58+
items:
59+
- description: SSS (Security Sub System) operating clock
60+
61+
clock-names:
62+
items:
63+
- const: secss
64+
3365
additionalProperties: false
3466

3567
examples:

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,12 @@ F: include/uapi/linux/psp-dbc.h
980980
F: tools/crypto/ccp/*.c
981981
F: tools/crypto/ccp/*.py
982982

983+
AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER - HSTI SUPPORT
984+
M: Mario Limonciello <[email protected]>
985+
986+
S: Supported
987+
F: drivers/crypto/ccp/hsti.*
988+
983989
AMD DISPLAY CORE
984990
M: Harry Wentland <[email protected]>
985991
M: Leo Li <[email protected]>

arch/arm/crypto/aes-neonbs-glue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/module.h>
1818

1919
MODULE_AUTHOR("Ard Biesheuvel <[email protected]>");
20+
MODULE_DESCRIPTION("Bit sliced AES using NEON instructions");
2021
MODULE_LICENSE("GPL v2");
2122

2223
MODULE_ALIAS_CRYPTO("ecb(aes)");

arch/arm/crypto/crc32-ce-core.S

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
*/
4949

5050
#include <linux/linkage.h>
51+
#include <linux/cfi_types.h>
5152
#include <asm/assembler.h>
5253

5354
.text
@@ -123,11 +124,12 @@
123124
* uint crc32_pmull_le(unsigned char const *buffer,
124125
* size_t len, uint crc32)
125126
*/
126-
ENTRY(crc32_pmull_le)
127+
SYM_FUNC_START(crc32_pmull_le)
127128
adr r3, .Lcrc32_constants
128129
b 0f
130+
SYM_FUNC_END(crc32_pmull_le)
129131

130-
ENTRY(crc32c_pmull_le)
132+
SYM_FUNC_START(crc32c_pmull_le)
131133
adr r3, .Lcrc32c_constants
132134

133135
0: bic LEN, LEN, #15
@@ -236,8 +238,7 @@ fold_64:
236238
vmov r0, s5
237239

238240
bx lr
239-
ENDPROC(crc32_pmull_le)
240-
ENDPROC(crc32c_pmull_le)
241+
SYM_FUNC_END(crc32c_pmull_le)
241242

242243
.macro __crc32, c
243244
subs ip, r2, #8
@@ -296,11 +297,11 @@ ARM_BE8(rev16 r3, r3 )
296297
.endm
297298

298299
.align 5
299-
ENTRY(crc32_armv8_le)
300+
SYM_TYPED_FUNC_START(crc32_armv8_le)
300301
__crc32
301-
ENDPROC(crc32_armv8_le)
302+
SYM_FUNC_END(crc32_armv8_le)
302303

303304
.align 5
304-
ENTRY(crc32c_armv8_le)
305+
SYM_TYPED_FUNC_START(crc32c_armv8_le)
305306
__crc32 c
306-
ENDPROC(crc32c_armv8_le)
307+
SYM_FUNC_END(crc32c_armv8_le)

arch/arm/crypto/crc32-ce-glue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ module_init(crc32_pmull_mod_init);
241241
module_exit(crc32_pmull_mod_exit);
242242

243243
MODULE_AUTHOR("Ard Biesheuvel <[email protected]>");
244+
MODULE_DESCRIPTION("Accelerated CRC32(C) using ARM CRC, NEON and Crypto Extensions");
244245
MODULE_LICENSE("GPL v2");
245246
MODULE_ALIAS_CRYPTO("crc32");
246247
MODULE_ALIAS_CRYPTO("crc32c");

arch/arm/crypto/crct10dif-ce-glue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,6 @@ module_init(crc_t10dif_mod_init);
8484
module_exit(crc_t10dif_mod_exit);
8585

8686
MODULE_AUTHOR("Ard Biesheuvel <[email protected]>");
87+
MODULE_DESCRIPTION("Accelerated CRC-T10DIF using ARM NEON and Crypto Extensions");
8788
MODULE_LICENSE("GPL v2");
8889
MODULE_ALIAS_CRYPTO("crct10dif");

arch/arm/crypto/curve25519-glue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,5 @@ module_exit(arm_curve25519_exit);
133133

134134
MODULE_ALIAS_CRYPTO("curve25519");
135135
MODULE_ALIAS_CRYPTO("curve25519-neon");
136+
MODULE_DESCRIPTION("Public key crypto: Curve25519 (NEON-accelerated)");
136137
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)