Skip to content

Commit 14418dd

Browse files
committed
Merge tag 'v6.16-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Fix memcpy_sglist to handle partially overlapping SG lists - Use memcpy_sglist to replace null skcipher - Rename CRYPTO_TESTS to CRYPTO_BENCHMARK - Flip CRYPTO_MANAGER_DISABLE_TEST into CRYPTO_SELFTESTS - Hide CRYPTO_MANAGER - Add delayed freeing of driver crypto_alg structures Compression: - Allocate large buffers on first use instead of initialisation in scomp - Drop destination linearisation buffer in scomp - Move scomp stream allocation into acomp - Add acomp scatter-gather walker - Remove request chaining - Add optional async request allocation Hashing: - Remove request chaining - Add optional async request allocation - Move partial block handling into API - Add ahash support to hmac - Fix shash documentation to disallow usage in hard IRQs Algorithms: - Remove unnecessary SIMD fallback code on x86 and arm/arm64 - Drop avx10_256 xts(aes)/ctr(aes) on x86 - Improve avx-512 optimisations for xts(aes) - Move chacha arch implementations into lib/crypto - Move poly1305 into lib/crypto and drop unused Crypto API algorithm - Disable powerpc/poly1305 as it has no SIMD fallback - Move sha256 arch implementations into lib/crypto - Convert deflate to acomp - Set block size correctly in cbcmac Drivers: - Do not use sg_dma_len before mapping in sun8i-ss - Fix warm-reboot failure by making shutdown do more work in qat - Add locking in zynqmp-sha - Remove cavium/zip - Add support for PCI device 0x17D8 to ccp - Add qat_6xxx support in qat - Add support for RK3576 in rockchip-rng - Add support for i.MX8QM in caam Others: - Fix irq_fpu_usable/kernel_fpu_begin inconsistency during CPU bring-up - Add new SEV/SNP platform shutdown API in ccp" * tag 'v6.16-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (382 commits) x86/fpu: Fix irq_fpu_usable() to return false during CPU onlining crypto: qat - add missing header inclusion crypto: api - Redo lookup on EEXIST Revert "crypto: testmgr - Add hash export format testing" crypto: marvell/cesa - Do not chain submitted requests crypto: powerpc/poly1305 - add depends on BROKEN for now Revert "crypto: powerpc/poly1305 - Add SIMD fallback" crypto: ccp - Add missing tee info reg for teev2 crypto: ccp - Add missing bootloader info reg for pspv5 crypto: sun8i-ce - move fallback ahash_request to the end of the struct crypto: octeontx2 - Use dynamic allocated memory region for lmtst crypto: octeontx2 - Initialize cptlfs device info once crypto: xts - Only add ecb if it is not already there crypto: lrw - Only add ecb if it is not already there crypto: testmgr - Add hash export format testing crypto: testmgr - Use ahash for generic tfm crypto: hmac - Add ahash support crypto: testmgr - Ignore EEXIST on shash allocation crypto: algapi - Add driver template support to crypto_inst_setname crypto: shash - Set reqsize in shash_alg ...
2 parents 15d90a5 + 2297554 commit 14418dd

File tree

583 files changed

+13730
-19565
lines changed

Some content is hidden

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

583 files changed

+13730
-19565
lines changed

Documentation/ABI/testing/sysfs-driver-qat_ras

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ KernelVersion: 6.7
44
55
Description: (RO) Reports the number of correctable errors detected by the device.
66

7-
This attribute is only available for qat_4xxx devices.
7+
This attribute is only available for qat_4xxx and qat_6xxx devices.
88

99
What: /sys/bus/pci/devices/<BDF>/qat_ras/errors_nonfatal
1010
Date: January 2024
1111
KernelVersion: 6.7
1212
1313
Description: (RO) Reports the number of non fatal errors detected by the device.
1414

15-
This attribute is only available for qat_4xxx devices.
15+
This attribute is only available for qat_4xxx and qat_6xxx devices.
1616

1717
What: /sys/bus/pci/devices/<BDF>/qat_ras/errors_fatal
1818
Date: January 2024
1919
KernelVersion: 6.7
2020
2121
Description: (RO) Reports the number of fatal errors detected by the device.
2222

23-
This attribute is only available for qat_4xxx devices.
23+
This attribute is only available for qat_4xxx and qat_6xxx devices.
2424

2525
What: /sys/bus/pci/devices/<BDF>/qat_ras/reset_error_counters
2626
Date: January 2024
@@ -38,4 +38,4 @@ Description: (WO) Write to resets all error counters of a device.
3838
# cat /sys/bus/pci/devices/<BDF>/qat_ras/errors_fatal
3939
0
4040

41-
This attribute is only available for qat_4xxx devices.
41+
This attribute is only available for qat_4xxx and qat_6xxx devices.
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/amd,ccp-seattle-v1a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AMD Cryptographic Coprocessor (ccp)
8+
9+
maintainers:
10+
- Tom Lendacky <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: amd,ccp-seattle-v1a
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
dma-coherent: true
23+
24+
required:
25+
- compatible
26+
- reg
27+
- interrupts
28+
29+
additionalProperties: false
30+
31+
examples:
32+
- |
33+
crypto@e0100000 {
34+
compatible = "amd,ccp-seattle-v1a";
35+
reg = <0xe0100000 0x10000>;
36+
interrupts = <0 3 4>;
37+
dma-coherent;
38+
};

Documentation/devicetree/bindings/crypto/amd-ccp.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

Documentation/devicetree/bindings/crypto/artpec6-crypto.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/crypto/axis,artpec6-crypto.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Axis ARTPEC6 crypto engine with PDMA interface
8+
9+
maintainers:
10+
- Lars Persson <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- axis,artpec6-crypto
16+
- axis,artpec7-crypto
17+
18+
reg:
19+
maxItems: 1
20+
21+
interrupts:
22+
maxItems: 1
23+
24+
required:
25+
- compatible
26+
- reg
27+
- interrupts
28+
29+
additionalProperties: false
30+
31+
examples:
32+
- |
33+
#include <dt-bindings/interrupt-controller/arm-gic.h>
34+
35+
crypto@f4264000 {
36+
compatible = "axis,artpec6-crypto";
37+
reg = <0xf4264000 0x1000>;
38+
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
39+
};

Documentation/devicetree/bindings/crypto/brcm,spu-crypto.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/brcm,spum-crypto.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom SPU Crypto Offload
8+
9+
maintainers:
10+
- Rob Rice <[email protected]>
11+
12+
description:
13+
The Broadcom Secure Processing Unit (SPU) hardware supports symmetric
14+
cryptographic offload for Broadcom SoCs. A SoC may have multiple SPU hardware
15+
blocks.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- brcm,spum-crypto
21+
- brcm,spu2-crypto
22+
- brcm,spu2-v2-crypto # enhanced SPU2 hardware features like SHA3 and Rabin Fingerprint support
23+
- brcm,spum-nsp-crypto # Northstar Plus variant of the SPU-M hardware
24+
25+
reg:
26+
maxItems: 1
27+
28+
mboxes:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- mboxes
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
crypto@612d0000 {
41+
compatible = "brcm,spum-crypto";
42+
reg = <0x612d0000 0x900>;
43+
mboxes = <&pdc0 0>;
44+
};

Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ properties:
3838
compatible:
3939
oneOf:
4040
- items:
41-
- const: fsl,sec-v5.4
41+
- enum:
42+
- fsl,sec-v5.4
43+
- fsl,sec-v6.0
4244
- const: fsl,sec-v5.0
4345
- const: fsl,sec-v4.0
4446
- items:
@@ -93,6 +95,12 @@ patternProperties:
9395
properties:
9496
compatible:
9597
oneOf:
98+
- items:
99+
- const: fsl,sec-v6.0-job-ring
100+
- const: fsl,sec-v5.2-job-ring
101+
- const: fsl,sec-v5.0-job-ring
102+
- const: fsl,sec-v4.4-job-ring
103+
- const: fsl,sec-v4.0-job-ring
96104
- items:
97105
- const: fsl,sec-v5.4-job-ring
98106
- const: fsl,sec-v5.0-job-ring

Documentation/devicetree/bindings/crypto/fsl-sec6.txt

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)