Skip to content

Commit 908057d

Browse files
torvaldstorvalds
committed
Merge tag 'v6.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "Drivers: - Add ciphertext hiding support to ccp - Add hashjoin, gather and UDMA data move features to hisilicon - Add lz4 and lz77_only to hisilicon - Add xilinx hwrng driver - Add ti driver with ecb/cbc aes support - Add ring buffer idle and command queue telemetry for GEN6 in qat Others: - Use rcu_dereference_all to stop false alarms in rhashtable - Fix CPU number wraparound in padata" * tag 'v6.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (78 commits) dt-bindings: rng: hisi-rng: convert to DT schema crypto: doc - Add explicit title heading to API docs hwrng: ks-sa - fix division by zero in ks_sa_rng_init KEYS: X.509: Fix Basic Constraints CA flag parsing crypto: anubis - simplify return statement in anubis_mod_init crypto: hisilicon/qm - set NULL to qm->debug.qm_diff_regs crypto: hisilicon/qm - clear all VF configurations in the hardware crypto: hisilicon - enable error reporting again crypto: hisilicon/qm - mask axi error before memory init crypto: hisilicon/qm - invalidate queues in use crypto: qat - Return pointer directly in adf_ctl_alloc_resources crypto: aspeed - Fix dma_unmap_sg() direction rhashtable: Use rcu_dereference_all and rcu_dereference_all_check crypto: comp - Use same definition of context alloc and free ops crypto: omap - convert from tasklet to BH workqueue crypto: qat - Replace kzalloc() + copy_from_user() with memdup_user() crypto: caam - double the entropy delay interval for retry padata: WQ_PERCPU added to alloc_workqueue users padata: replace use of system_unbound_wq with system_dfl_wq crypto: cryptd - WQ_PERCPU added to alloc_workqueue users ...
2 parents d104e3d + 166c83f commit 908057d

File tree

95 files changed

+2850
-944
lines changed

Some content is hidden

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

95 files changed

+2850
-944
lines changed

‎Documentation/ABI/testing/debugfs-driver-qat_telemetry‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Description: (RO) Reports device telemetry counters.
5757
gp_lat_acc_avg average get to put latency [ns]
5858
bw_in PCIe, write bandwidth [Mbps]
5959
bw_out PCIe, read bandwidth [Mbps]
60+
re_acc_avg average ring empty time [ns]
6061
at_page_req_lat_avg Address Translator(AT), average page
6162
request latency [ns]
6263
at_trans_lat_avg AT, average page translation latency [ns]
@@ -85,6 +86,32 @@ Description: (RO) Reports device telemetry counters.
8586
exec_cph<N> execution count of Cipher slice N
8687
util_ath<N> utilization of Authentication slice N [%]
8788
exec_ath<N> execution count of Authentication slice N
89+
cmdq_wait_cnv<N> wait time for cmdq N to get Compression and verify
90+
slice ownership
91+
cmdq_exec_cnv<N> Compression and verify slice execution time while
92+
owned by cmdq N
93+
cmdq_drain_cnv<N> time taken for cmdq N to release Compression and
94+
verify slice ownership
95+
cmdq_wait_dcprz<N> wait time for cmdq N to get Decompression
96+
slice N ownership
97+
cmdq_exec_dcprz<N> Decompression slice execution time while
98+
owned by cmdq N
99+
cmdq_drain_dcprz<N> time taken for cmdq N to release Decompression
100+
slice ownership
101+
cmdq_wait_pke<N> wait time for cmdq N to get PKE slice ownership
102+
cmdq_exec_pke<N> PKE slice execution time while owned by cmdq N
103+
cmdq_drain_pke<N> time taken for cmdq N to release PKE slice
104+
ownership
105+
cmdq_wait_ucs<N> wait time for cmdq N to get UCS slice ownership
106+
cmdq_exec_ucs<N> UCS slice execution time while owned by cmdq N
107+
cmdq_drain_ucs<N> time taken for cmdq N to release UCS slice
108+
ownership
109+
cmdq_wait_ath<N> wait time for cmdq N to get Authentication slice
110+
ownership
111+
cmdq_exec_ath<N> Authentication slice execution time while owned
112+
by cmdq N
113+
cmdq_drain_ath<N> time taken for cmdq N to release Authentication
114+
slice ownership
88115
======================= ========================================
89116

90117
The telemetry report file can be read with the following command::

‎Documentation/crypto/api-aead.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Authenticated Encryption With Associated Data (AEAD)
2+
====================================================
3+
14
Authenticated Encryption With Associated Data (AEAD) Algorithm Definitions
25
--------------------------------------------------------------------------
36

‎Documentation/crypto/api-akcipher.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Asymmetric Cipher
2+
=================
3+
14
Asymmetric Cipher Algorithm Definitions
25
---------------------------------------
36

‎Documentation/crypto/api-digest.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Message Digest
2+
==============
3+
14
Message Digest Algorithm Definitions
25
------------------------------------
36

‎Documentation/crypto/api-kpp.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Key-agreement Protocol Primitives (KPP)
2+
=======================================
3+
14
Key-agreement Protocol Primitives (KPP) Cipher Algorithm Definitions
25
--------------------------------------------------------------------
36

‎Documentation/crypto/api-rng.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Random Number Generator (RNG)
2+
=============================
3+
14
Random Number Algorithm Definitions
25
-----------------------------------
36

‎Documentation/crypto/api-sig.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Asymmetric Signature
2+
====================
3+
14
Asymmetric Signature Algorithm Definitions
25
------------------------------------------
36

‎Documentation/crypto/api-skcipher.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Symmetric Key Cipher
2+
====================
3+
14
Block Cipher Algorithm Definitions
25
----------------------------------
36

‎Documentation/devicetree/bindings/crypto/ti,am62l-dthev2.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/crypto/ti,am62l-dthev2.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: K3 SoC DTHE V2 crypto module
8+
9+
maintainers:
10+
- T Pratham <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- ti,am62l-dthev2
16+
17+
reg:
18+
maxItems: 1
19+
20+
dmas:
21+
items:
22+
- description: AES Engine RX DMA Channel
23+
- description: AES Engine TX DMA Channel
24+
- description: SHA Engine TX DMA Channel
25+
26+
dma-names:
27+
items:
28+
- const: rx
29+
- const: tx1
30+
- const: tx2
31+
32+
required:
33+
- compatible
34+
- reg
35+
- dmas
36+
- dma-names
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
crypto@40800000 {
43+
compatible = "ti,am62l-dthev2";
44+
reg = <0x40800000 0x10000>;
45+
46+
dmas = <&main_bcdma 0 0 0x4700 0>,
47+
<&main_bcdma 0 0 0xc701 0>,
48+
<&main_bcdma 0 0 0xc700 0>;
49+
dma-names = "rx", "tx1", "tx2";
50+
};

‎Documentation/devicetree/bindings/crypto/xlnx,versal-trng.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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/crypto/xlnx,versal-trng.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Xilinx Versal True Random Number Generator Hardware Accelerator
8+
9+
maintainers:
10+
- Harsh Jain <[email protected]>
11+
- Mounika Botcha <[email protected]>
12+
13+
description:
14+
The Versal True Random Number Generator consists of Ring Oscillators as
15+
entropy source and a deterministic CTR_DRBG random bit generator (DRBG).
16+
17+
properties:
18+
compatible:
19+
const: xlnx,versal-trng
20+
21+
reg:
22+
maxItems: 1
23+
24+
required:
25+
- reg
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
rng@f1230000 {
32+
compatible = "xlnx,versal-trng";
33+
reg = <0xf1230000 0x1000>;
34+
};
35+
...

0 commit comments

Comments
 (0)