Skip to content

Commit 08df88f

Browse files
committed
Merge tag 'v7.0-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto update from Herbert Xu: "API: - Fix race condition in hwrng core by using RCU Algorithms: - Allow authenc(sha224,rfc3686) in fips mode - Add test vectors for authenc(hmac(sha384),cbc(aes)) - Add test vectors for authenc(hmac(sha224),cbc(aes)) - Add test vectors for authenc(hmac(md5),cbc(des3_ede)) - Add lz4 support in hisi_zip - Only allow clear key use during self-test in s390/{phmac,paes} Drivers: - Set rng quality to 900 in airoha - Add gcm(aes) support for AMD/Xilinx Versal device - Allow tfms to share device in hisilicon/trng" * tag 'v7.0-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (100 commits) crypto: img-hash - Use unregister_ahashes in img_{un}register_algs crypto: testmgr - Add test vectors for authenc(hmac(md5),cbc(des3_ede)) crypto: cesa - Simplify return statement in mv_cesa_dequeue_req_locked crypto: testmgr - Add test vectors for authenc(hmac(sha224),cbc(aes)) crypto: testmgr - Add test vectors for authenc(hmac(sha384),cbc(aes)) hwrng: core - use RCU and work_struct to fix race condition crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req() crypto: xilinx - Fix inconsistant indentation crypto: rng - Use unregister_rngs in register_rngs crypto: atmel - Use unregister_{aeads,ahashes,skciphers} hwrng: optee - simplify OP-TEE context match crypto: ccp - Add sysfs attribute for boot integrity dt-bindings: crypto: atmel,at91sam9g46-sha: add microchip,lan9691-sha dt-bindings: crypto: atmel,at91sam9g46-aes: add microchip,lan9691-aes dt-bindings: crypto: qcom,inline-crypto-engine: document the Milos ICE crypto: caam - fix netdev memory leak in dpaa2_caam_probe crypto: hisilicon/qm - increase wait time for mailbox crypto: hisilicon/qm - obtain the mailbox configuration at one time crypto: hisilicon/qm - remove unnecessary code in qm_mb_write() crypto: hisilicon/qm - move the barrier before writing to the mailbox register ...
2 parents 13d83ea + 0ce9093 commit 08df88f

File tree

91 files changed

+3284
-1347
lines changed

Some content is hidden

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

91 files changed

+3284
-1347
lines changed

Documentation/ABI/testing/sysfs-driver-ccp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ Description:
88
0: Not fused
99
1: Fused
1010

11+
What: /sys/bus/pci/devices/<BDF>/boot_integrity
12+
Date: April 2026
13+
KernelVersion: 6.20
14+
Contact: mario.limonciello@amd.com
15+
Description:
16+
The /sys/bus/pci/devices/<BDF>/boot_integrity reports
17+
whether the AMD CPU or APU is used for a hardware root of trust
18+
during the boot process.
19+
Possible values:
20+
0: Not hardware root of trust.
21+
1: Hardware root of trust
22+
23+
NOTE: Vendors may provide design specific alternative hardware
24+
root of trust implementations.
25+
1126
What: /sys/bus/pci/devices/<BDF>/debug_lock_on
1227
Date: June 2022
1328
KernelVersion: 5.19

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
- const: atmel,at91sam9g46-aes
1717
- items:
1818
- enum:
19+
- microchip,lan9691-aes
1920
- microchip,sam9x7-aes
2021
- microchip,sama7d65-aes
2122
- const: atmel,at91sam9g46-aes

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
- const: atmel,at91sam9g46-sha
1717
- items:
1818
- enum:
19+
- microchip,lan9691-sha
1920
- microchip,sam9x7-sha
2021
- microchip,sama7d65-sha
2122
- const: atmel,at91sam9g46-sha

Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
items:
1515
- enum:
1616
- qcom,kaanapali-inline-crypto-engine
17+
- qcom,milos-inline-crypto-engine
1718
- qcom,qcs8300-inline-crypto-engine
1819
- qcom,sa8775p-inline-crypto-engine
1920
- qcom,sc7180-inline-crypto-engine

Documentation/devicetree/bindings/crypto/qcom,prng.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ properties:
3030
- qcom,sm8550-trng
3131
- qcom,sm8650-trng
3232
- qcom,sm8750-trng
33+
- qcom,x1e80100-trng
3334
- const: qcom,trng
3435

3536
reg:

Documentation/devicetree/bindings/crypto/xlnx,zynqmp-aes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ description: |
1414
The ZynqMP AES-GCM hardened cryptographic accelerator is used to
1515
encrypt or decrypt the data with provided key and initialization vector.
1616
17+
deprecated: true
18+
1719
properties:
1820
compatible:
1921
const: xlnx,zynqmp-aes

Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ properties:
104104
used to encrypt or decrypt the data with provided key and initialization
105105
vector.
106106
type: object
107+
deprecated: true
107108

108109
required:
109110
- compatible

0 commit comments

Comments
 (0)