Skip to content

Commit c8e7699

Browse files
torvaldstorvalds
committed
Merge tag 'v6.9-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Avoid unnecessary copying in scomp for trivial SG lists Algorithms: - Optimise NEON CCM implementation on ARM64 Drivers: - Add queue stop/query debugfs support in hisilicon/qm - Intel qat updates and cleanups" * tag 'v6.9-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (79 commits) Revert "crypto: remove CONFIG_CRYPTO_STATS" crypto: scomp - remove memcpy if sg_nents is 1 and pages are lowmem crypto: tcrypt - add ffdhe2048(dh) test crypto: iaa - fix the missing CRYPTO_ALG_ASYNC in cra_flags crypto: hisilicon/zip - fix the missing CRYPTO_ALG_ASYNC in cra_flags hwrng: hisi - use dev_err_probe MAINTAINERS: Remove T Ambarus from few mchp entries crypto: iaa - Fix comp/decomp delay statistics crypto: iaa - Fix async_disable descriptor leak dt-bindings: rng: atmel,at91-trng: add sam9x7 TRNG dt-bindings: crypto: add sam9x7 in Atmel TDES dt-bindings: crypto: add sam9x7 in Atmel SHA dt-bindings: crypto: add sam9x7 in Atmel AES crypto: remove CONFIG_CRYPTO_STATS crypto: dh - Make public key test FIPS-only crypto: rockchip - fix to check return value crypto: jitter - fix CRYPTO_JITTERENTROPY help text crypto: qat - make ring to service map common for QAT GEN4 crypto: qat - fix ring to service map for dcc in 420xx crypto: qat - fix ring to service map for dcc in 4xxx ...
2 parents 4138f02 + 6a8dbd7 commit c8e7699

File tree

100 files changed

+1446
-1012
lines changed

Some content is hidden

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

100 files changed

+1446
-1012
lines changed

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,29 @@ Description: (RO) Read returns, for each Acceleration Engine (AE), the number
8181
<N>: Number of Compress and Verify (CnV) errors and type
8282
of the last CnV error detected by Acceleration
8383
Engine N.
84+
85+
What: /sys/kernel/debug/qat_<device>_<BDF>/heartbeat/inject_error
86+
Date: March 2024
87+
KernelVersion: 6.8
88+
Contact: qat-linux@intel.com
89+
Description: (WO) Write to inject an error that simulates an heartbeat
90+
failure. This is to be used for testing purposes.
91+
92+
After writing this file, the driver stops arbitration on a
93+
random engine and disables the fetching of heartbeat counters.
94+
If a workload is running on the device, a job submitted to the
95+
accelerator might not get a response and a read of the
96+
`heartbeat/status` attribute might report -1, i.e. device
97+
unresponsive.
98+
The error is unrecoverable thus the device must be restarted to
99+
restore its functionality.
100+
101+
This attribute is available only when the kernel is built with
102+
CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION=y.
103+
104+
A write of 1 enables error injection.
105+
106+
The following example shows how to enable error injection::
107+
108+
# cd /sys/kernel/debug/qat_<device>_<BDF>
109+
# echo 1 > heartbeat/inject_error

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,28 @@ Description: QM debug registers(regs) read hardware register value. This
111111
node is used to show the change of the qm register values. This
112112
node can be help users to check the change of register values.
113113

114+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/qm_state
115+
Date: Jan 2024
116+
Contact: linux-crypto@vger.kernel.org
117+
Description: Dump the state of the device.
118+
0: busy, 1: idle.
119+
Only available for PF, and take no other effect on HPRE.
120+
121+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_timeout
122+
Date: Feb 2024
123+
Contact: linux-crypto@vger.kernel.org
124+
Description: Set the wait time when stop queue fails. Available for both PF
125+
and VF, and take no other effect on HPRE.
126+
0: not wait(default), others value: wait dev_timeout * 20 microsecond.
127+
128+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/dev_state
129+
Date: Feb 2024
130+
Contact: linux-crypto@vger.kernel.org
131+
Description: Dump the stop queue status of the QM. The default value is 0,
132+
if dev_timeout is set, when stop queue fails, the dev_state
133+
will return non-zero value. Available for both PF and VF,
134+
and take no other effect on HPRE.
135+
114136
What: /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/diff_regs
115137
Date: Mar 2022
116138
Contact: linux-crypto@vger.kernel.org

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,28 @@ Description: QM debug registers(regs) read hardware register value. This
9191
node is used to show the change of the qm register values. This
9292
node can be help users to check the change of register values.
9393

94+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_state
95+
Date: Jan 2024
96+
Contact: linux-crypto@vger.kernel.org
97+
Description: Dump the state of the device.
98+
0: busy, 1: idle.
99+
Only available for PF, and take no other effect on SEC.
100+
101+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_timeout
102+
Date: Feb 2024
103+
Contact: linux-crypto@vger.kernel.org
104+
Description: Set the wait time when stop queue fails. Available for both PF
105+
and VF, and take no other effect on SEC.
106+
0: not wait(default), others value: wait dev_timeout * 20 microsecond.
107+
108+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/dev_state
109+
Date: Feb 2024
110+
Contact: linux-crypto@vger.kernel.org
111+
Description: Dump the stop queue status of the QM. The default value is 0,
112+
if dev_timeout is set, when stop queue fails, the dev_state
113+
will return non-zero value. Available for both PF and VF,
114+
and take no other effect on SEC.
115+
94116
What: /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/diff_regs
95117
Date: Mar 2022
96118
Contact: linux-crypto@vger.kernel.org

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,28 @@ Description: QM debug registers(regs) read hardware register value. This
104104
node is used to show the change of the qm registers value. This
105105
node can be help users to check the change of register values.
106106

107+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/qm_state
108+
Date: Jan 2024
109+
Contact: linux-crypto@vger.kernel.org
110+
Description: Dump the state of the device.
111+
0: busy, 1: idle.
112+
Only available for PF, and take no other effect on ZIP.
113+
114+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_timeout
115+
Date: Feb 2024
116+
Contact: linux-crypto@vger.kernel.org
117+
Description: Set the wait time when stop queue fails. Available for both PF
118+
and VF, and take no other effect on ZIP.
119+
0: not wait(default), others value: wait dev_timeout * 20 microsecond.
120+
121+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/dev_state
122+
Date: Feb 2024
123+
Contact: linux-crypto@vger.kernel.org
124+
Description: Dump the stop queue status of the QM. The default value is 0,
125+
if dev_timeout is set, when stop queue fails, the dev_state
126+
will return non-zero value. Available for both PF and VF,
127+
and take no other effect on ZIP.
128+
107129
What: /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/diff_regs
108130
Date: Mar 2022
109131
Contact: linux-crypto@vger.kernel.org

‎Documentation/ABI/testing/sysfs-driver-qat

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,23 @@ Description:
141141
64
142142

143143
This attribute is only available for qat_4xxx devices.
144+
145+
What: /sys/bus/pci/devices/<BDF>/qat/auto_reset
146+
Date: March 2024
147+
KernelVersion: 6.8
148+
Contact: qat-linux@intel.com
149+
Description: (RW) Reports the current state of the autoreset feature
150+
for a QAT device
151+
152+
Write to the attribute to enable or disable device auto reset.
153+
154+
Device auto reset is disabled by default.
155+
156+
The values are:
157+
158+
* 1/Yy/on: auto reset enabled. If the device encounters an
159+
unrecoverable error, it will be reset automatically.
160+
* 0/Nn/off: auto reset disabled. If the device encounters an
161+
unrecoverable error, it will not be reset.
162+
163+
This attribute is only available for qat_4xxx devices.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
const: atmel,at91sam9g46-aes
15+
oneOf:
16+
- const: atmel,at91sam9g46-aes
17+
- items:
18+
- const: microchip,sam9x7-aes
19+
- const: atmel,at91sam9g46-aes
1620

1721
reg:
1822
maxItems: 1

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
const: atmel,at91sam9g46-sha
15+
oneOf:
16+
- const: atmel,at91sam9g46-sha
17+
- items:
18+
- const: microchip,sam9x7-sha
19+
- const: atmel,at91sam9g46-sha
1620

1721
reg:
1822
maxItems: 1

‎Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
const: atmel,at91sam9g46-tdes
15+
oneOf:
16+
- const: atmel,at91sam9g46-tdes
17+
- items:
18+
- const: microchip,sam9x7-tdes
19+
- const: atmel,at91sam9g46-tdes
1620

1721
reg:
1822
maxItems: 1

‎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,sa8775p-inline-crypto-engine
17+
- qcom,sc7180-inline-crypto-engine
1718
- qcom,sm8450-inline-crypto-engine
1819
- qcom,sm8550-inline-crypto-engine
1920
- qcom,sm8650-inline-crypto-engine

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ properties:
4545
- items:
4646
- enum:
4747
- qcom,sc7280-qce
48+
- qcom,sm6350-qce
4849
- qcom,sm8250-qce
4950
- qcom,sm8350-qce
5051
- qcom,sm8450-qce

0 commit comments

Comments
 (0)