Skip to content

Commit 02b2f1a

Browse files
torvaldstorvalds
committed
Merge tag 'v6.13-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Add sig driver API - Remove signing/verification from akcipher API - Move crypto_simd_disabled_for_test to lib/crypto - Add WARN_ON for return values from driver that indicates memory corruption Algorithms: - Provide crc32-arch and crc32c-arch through Crypto API - Optimise crc32c code size on x86 - Optimise crct10dif on arm/arm64 - Optimise p10-aes-gcm on powerpc - Optimise aegis128 on x86 - Output full sample from test interface in jitter RNG - Retry without padata when it fails in pcrypt Drivers: - Add support for Airoha EN7581 TRNG - Add support for STM32MP25x platforms in stm32 - Enable iproc-r200 RNG driver on BCMBCA - Add Broadcom BCM74110 RNG driver" * tag 'v6.13-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (112 commits) crypto: marvell/cesa - fix uninit value for struct mv_cesa_op_ctx crypto: cavium - Fix an error handling path in cpt_ucode_load_fw() crypto: aesni - Move back to module_init crypto: lib/mpi - Export mpi_set_bit crypto: aes-gcm-p10 - Use the correct bit to test for P10 hwrng: amd - remove reference to removed PPC_MAPLE config crypto: arm/crct10dif - Implement plain NEON variant crypto: arm/crct10dif - Macroify PMULL asm code crypto: arm/crct10dif - Use existing mov_l macro instead of __adrl crypto: arm64/crct10dif - Remove remaining 64x64 PMULL fallback code crypto: arm64/crct10dif - Use faster 16x64 bit polynomial multiply crypto: arm64/crct10dif - Remove obsolete chunking logic crypto: bcm - add error check in the ahash_hmac_init function crypto: caam - add error check to caam_rsa_set_priv_key_form hwrng: bcm74110 - Add Broadcom BCM74110 RNG driver dt-bindings: rng: add binding for BCM74110 RNG padata: Clean up in padata_do_multithreaded() crypto: inside-secure - Fix the return value of safexcel_xcbcmac_cra_init() crypto: qat - Fix missing destroy_workqueue in adf_init_aer() crypto: rsassa-pkcs1 - Reinstate support for legacy protocols ...
2 parents 1af29b3 + 4223414 commit 02b2f1a

File tree

170 files changed

+5964
-4104
lines changed

Some content is hidden

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

170 files changed

+5964
-4104
lines changed

‎Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,10 @@ Date: Apr 2020
184184
Contact: linux-crypto@vger.kernel.org
185185
Description: Dump the total number of time out requests.
186186
Available for both PF and VF, and take no other effect on HPRE.
187+
188+
What: /sys/kernel/debug/hisi_hpre/<bdf>/cap_regs
189+
Date: Oct 2024
190+
Contact: linux-crypto@vger.kernel.org
191+
Description: Dump the values of the qm and hpre capability bit registers and
192+
support the query of device specifications to facilitate fault locating.
193+
Available for both PF and VF, and take no other effect on HPRE.

‎Documentation/ABI/testing/debugfs-hisi-sec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,10 @@ Contact: linux-crypto@vger.kernel.org
157157
Description: Dump the total number of completed but marked error requests
158158
to be received.
159159
Available for both PF and VF, and take no other effect on SEC.
160+
161+
What: /sys/kernel/debug/hisi_sec2/<bdf>/cap_regs
162+
Date: Oct 2024
163+
Contact: linux-crypto@vger.kernel.org
164+
Description: Dump the values of the qm and sec capability bit registers and
165+
support the query of device specifications to facilitate fault locating.
166+
Available for both PF and VF, and take no other effect on SEC.

‎Documentation/ABI/testing/debugfs-hisi-zip

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,10 @@ Contact: linux-crypto@vger.kernel.org
158158
Description: Dump the total number of BD type error requests
159159
to be received.
160160
Available for both PF and VF, and take no other effect on ZIP.
161+
162+
What: /sys/kernel/debug/hisi_zip/<bdf>/cap_regs
163+
Date: Oct 2024
164+
Contact: linux-crypto@vger.kernel.org
165+
Description: Dump the values of the qm and zip capability bit registers and
166+
support the query of device specifications to facilitate fault locating.
167+
Available for both PF and VF, and take no other effect on ZIP.

‎Documentation/crypto/api-akcipher.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Asymmetric Cipher API
88
---------------------
99

1010
.. kernel-doc:: include/crypto/akcipher.h
11-
:doc: Generic Public Key API
11+
:doc: Generic Public Key Cipher API
1212

1313
.. kernel-doc:: include/crypto/akcipher.h
14-
:functions: crypto_alloc_akcipher crypto_free_akcipher crypto_akcipher_set_pub_key crypto_akcipher_set_priv_key crypto_akcipher_maxsize crypto_akcipher_encrypt crypto_akcipher_decrypt crypto_akcipher_sign crypto_akcipher_verify
14+
:functions: crypto_alloc_akcipher crypto_free_akcipher crypto_akcipher_set_pub_key crypto_akcipher_set_priv_key crypto_akcipher_maxsize crypto_akcipher_encrypt crypto_akcipher_decrypt
1515

1616
Asymmetric Cipher Request Handle
1717
--------------------------------

‎Documentation/crypto/api-sig.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Asymmetric Signature Algorithm Definitions
2+
------------------------------------------
3+
4+
.. kernel-doc:: include/crypto/sig.h
5+
:functions: sig_alg
6+
7+
Asymmetric Signature API
8+
------------------------
9+
10+
.. kernel-doc:: include/crypto/sig.h
11+
:doc: Generic Public Key Signature API
12+
13+
.. kernel-doc:: include/crypto/sig.h
14+
:functions: crypto_alloc_sig crypto_free_sig crypto_sig_set_pubkey crypto_sig_set_privkey crypto_sig_keysize crypto_sig_maxsize crypto_sig_digestsize crypto_sig_sign crypto_sig_verify
15+

‎Documentation/crypto/api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ Programming Interface
1010
api-digest
1111
api-rng
1212
api-akcipher
13+
api-sig
1314
api-kpp

‎Documentation/crypto/architecture.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ the aforementioned cipher types:
214214

215215
- CRYPTO_ALG_TYPE_AKCIPHER Asymmetric cipher
216216

217+
- CRYPTO_ALG_TYPE_SIG Asymmetric signature
218+
217219
- CRYPTO_ALG_TYPE_PCOMPRESS Enhanced version of
218220
CRYPTO_ALG_TYPE_COMPRESS allowing for segmented compression /
219221
decompression instead of performing the operation on one segment

‎Documentation/devicetree/bindings/crypto/qcom-qce.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444

4545
- items:
4646
- enum:
47+
- qcom,sa8775p-qce
4748
- qcom,sc7280-qce
4849
- qcom,sm6350-qce
4950
- qcom,sm8250-qce

‎Documentation/devicetree/bindings/rng/airoha,en7581-trng.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rng/airoha,en7581-trng.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN7851 True Random Number Generator
8+
9+
maintainers:
10+
- Christian Marangi <ansuelsmth@gmail.com>
11+
12+
properties:
13+
compatible:
14+
const: airoha,en7581-trng
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
required:
23+
- compatible
24+
- reg
25+
- interrupts
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
#include <dt-bindings/interrupt-controller/irq.h>
32+
#include <dt-bindings/interrupt-controller/arm-gic.h>
33+
34+
rng@1faa1000 {
35+
compatible = "airoha,en7581-trng";
36+
reg = <0x1faa1000 0x1000>;
37+
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
38+
};

‎Documentation/devicetree/bindings/rng/brcm,bcm74110-rng.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rng/brcm,bcm74110-rng.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: BCM74110 Random number generator
8+
9+
description:
10+
Random number generator used on the BCM74110.
11+
12+
maintainers:
13+
- Markus Mayer <mmayer@broadcom.com>
14+
- Florian Fainelli <florian.fainelli@broadcom.com>
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- brcm,bcm74110-rng
20+
21+
reg:
22+
maxItems: 1
23+
24+
required:
25+
- compatible
26+
- reg
27+
28+
additionalProperties: false
29+
30+
examples:
31+
- |
32+
rng@83ba000 {
33+
compatible = "brcm,bcm74110-rng";
34+
reg = <0x83ba000 0x14>;
35+
};

0 commit comments

Comments
 (0)