Skip to content

Commit aec2f68

Browse files
torvaldstorvalds
committed
Merge tag 'v7.1-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto update from Herbert Xu: "API: - Replace crypto_get_default_rng with crypto_stdrng_get_bytes - Remove simd skcipher support - Allow algorithm types to be disabled when CRYPTO_SELFTESTS is off Algorithms: - Remove CPU-based des/3des acceleration - Add test vectors for authenc(hmac(md5),cbc({aes,des})) and authenc(hmac({md5,sha1,sha224,sha256,sha384,sha512}),rfc3686(ctr(aes))) - Replace spin lock with mutex in jitterentropy Drivers: - Add authenc algorithms to safexcel - Add support for zstd in qat - Add wireless mode support for QAT GEN6 - Add anti-rollback support for QAT GEN6 - Add support for ctr(aes), gcm(aes), and ccm(aes) in dthev2" * tag 'v7.1-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (129 commits) crypto: af_alg - use sock_kmemdup in alg_setkey_by_key_serial crypto: vmx - remove CRYPTO_DEV_VMX from Kconfig crypto: omap - convert reqctx buffer to fixed-size array crypto: atmel-sha204a - add Thorsten Blum as maintainer crypto: atmel-ecc - add Thorsten Blum as maintainer crypto: qat - fix IRQ cleanup on 6xxx probe failure crypto: geniv - Remove unused spinlock from struct aead_geniv_ctx crypto: qce - simplify qce_xts_swapiv() crypto: hisilicon - Fix dma_unmap_single() direction crypto: talitos - rename first/last to first_desc/last_desc crypto: talitos - fix SEC1 32k ahash request limitation crypto: jitterentropy - replace long-held spinlock with mutex crypto: hisilicon - remove unused and non-public APIs for qm and sec crypto: hisilicon/qm - drop redundant variable initialization crypto: hisilicon/qm - remove else after return crypto: hisilicon/qm - add const qualifier to info_name in struct qm_cmd_dump_item crypto: hisilicon - fix the format string type error crypto: ccree - fix a memory leak in cc_mac_digest() crypto: qat - add support for zstd crypto: qat - use swab32 macro ...
2 parents 8801e23 + 8879a3c commit aec2f68

166 files changed

Lines changed: 5481 additions & 4114 deletions

File tree

Some content is hidden

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ Description: Dump debug registers from the QM.
5050
Available for PF and VF in host. VF in guest currently only
5151
has one debug register.
5252

53+
What: /sys/kernel/debug/hisi_hpre/<bdf>/dev_usage
54+
Date: Mar 2026
55+
Contact: linux-crypto@vger.kernel.org
56+
Description: Query the real-time bandwidth usage of device.
57+
Returns the bandwidth usage of each channel on the device.
58+
The returned number is in percentage.
59+
5360
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/current_q
5461
Date: Sep 2019
5562
Contact: linux-crypto@vger.kernel.org

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ Description: The <bdf> is related the function for PF and VF.
2424
1/1000~1000/1000 of total QoS. The driver reading alg_qos to
2525
get related QoS in the host and VM, Such as "cat alg_qos".
2626

27+
What: /sys/kernel/debug/hisi_sec2/<bdf>/dev_usage
28+
Date: Mar 2026
29+
Contact: linux-crypto@vger.kernel.org
30+
Description: Query the real-time bandwidth usage of device.
31+
Returns the bandwidth usage of each channel on the device.
32+
The returned number is in percentage.
33+
2734
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_regs
2835
Date: Oct 2019
2936
Contact: linux-crypto@vger.kernel.org

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ Description: The <bdf> is related the function for PF and VF.
3636
1/1000~1000/1000 of total QoS. The driver reading alg_qos to
3737
get related QoS in the host and VM, Such as "cat alg_qos".
3838

39+
What: /sys/kernel/debug/hisi_zip/<bdf>/dev_usage
40+
Date: Mar 2026
41+
Contact: linux-crypto@vger.kernel.org
42+
Description: Query the real-time bandwidth usage of device.
43+
Returns the bandwidth usage of each channel on the device.
44+
The returned number is in percentage.
45+
3946
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/regs
4047
Date: Nov 2018
4148
Contact: linux-crypto@vger.kernel.org

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

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
What: /sys/bus/pci/devices/<BDF>/qat_svn/
2+
Date: June 2026
3+
KernelVersion: 7.1
4+
Contact: qat-linux@intel.com
5+
Description: Directory containing Security Version Number (SVN) attributes for
6+
the Anti-Rollback (ARB) feature. The ARB feature prevents downloading
7+
older firmware versions to the acceleration device.
8+
9+
What: /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min
10+
Date: June 2026
11+
KernelVersion: 7.1
12+
Contact: qat-linux@intel.com
13+
Description:
14+
(RO) Reports the minimum allowed firmware SVN.
15+
16+
Returns an integer greater than zero. Firmware with SVN lower than
17+
this value is rejected.
18+
19+
A write to qat_svn/commit will update this value. The update is not
20+
persistent across reboot; on reboot, this value is reset from
21+
qat_svn/permanent_min.
22+
23+
Example usage::
24+
25+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min
26+
2
27+
28+
This attribute is available only on devices that support
29+
Anti-Rollback.
30+
31+
What: /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min
32+
Date: June 2026
33+
KernelVersion: 7.1
34+
Contact: qat-linux@intel.com
35+
Description:
36+
(RO) Reports the persistent minimum SVN used to initialize
37+
qat_svn/enforced_min on each reboot.
38+
39+
Returns an integer greater than zero. A write to qat_svn/commit
40+
may update this value, depending on platform/BIOS settings.
41+
42+
Example usage::
43+
44+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min
45+
3
46+
47+
This attribute is available only on devices that support
48+
Anti-Rollback.
49+
50+
What: /sys/bus/pci/devices/<BDF>/qat_svn/active
51+
Date: June 2026
52+
KernelVersion: 7.1
53+
Contact: qat-linux@intel.com
54+
Description:
55+
(RO) Reports the SVN of the currently active firmware image.
56+
57+
Returns an integer greater than zero.
58+
59+
Example usage::
60+
61+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/active
62+
2
63+
64+
This attribute is available only on devices that support
65+
Anti-Rollback.
66+
67+
What: /sys/bus/pci/devices/<BDF>/qat_svn/commit
68+
Date: June 2026
69+
KernelVersion: 7.1
70+
Contact: qat-linux@intel.com
71+
Description:
72+
(WO) Commits the currently active SVN as the minimum allowed SVN.
73+
74+
Writing 1 sets qat_svn/enforced_min to the value of qat_svn/active,
75+
preventing future firmware loads with lower SVN.
76+
77+
Depending on platform/BIOS settings, a commit may also update
78+
qat_svn/permanent_min.
79+
80+
Note that on reboot, qat_svn/enforced_min reverts to
81+
qat_svn/permanent_min.
82+
83+
It is advisable to use this attribute with caution, only when
84+
it is necessary to set a new minimum SVN for the firmware.
85+
86+
Before committing the SVN update, it is crucial to check the
87+
current values of qat_svn/active, qat_svn/enforced_min and
88+
qat_svn/permanent_min. This verification helps ensure that the
89+
commit operation aligns with the intended outcome.
90+
91+
While writing to the file, any value other than '1' will result
92+
in an error and have no effect.
93+
94+
Example usage::
95+
96+
## Read current values
97+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min
98+
2
99+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min
100+
2
101+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/active
102+
3
103+
104+
## Commit active SVN
105+
# echo 1 > /sys/bus/pci/devices/<BDF>/qat_svn/commit
106+
107+
## Read updated values
108+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min
109+
3
110+
# cat /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min
111+
3
112+
113+
This attribute is available only on devices that support
114+
Anti-Rollback.

‎Documentation/crypto/userspace-if.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ user space, however. This includes the difference between synchronous
2323
and asynchronous invocations. The user space API call is fully
2424
synchronous.
2525

26-
[1] https://www.chronox.de/libkcapi.html
26+
[1] https://www.chronox.de/libkcapi/index.html
2727

2828
User Space API General Remarks
2929
------------------------------
@@ -406,4 +406,4 @@ Please see [1] for libkcapi which provides an easy-to-use wrapper around
406406
the aforementioned Netlink kernel interface. [1] also contains a test
407407
application that invokes all libkcapi API calls.
408408

409-
[1] https://www.chronox.de/libkcapi.html
409+
[1] https://www.chronox.de/libkcapi/index.html

‎Documentation/devicetree/bindings/crypto/inside-secure,safexcel.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- items:
1919
- enum:
2020
- marvell,armada-3700-crypto
21+
- mediatek,mt7981-crypto
2122
- mediatek,mt7986-crypto
2223
- const: inside-secure,safexcel-eip97ies
2324
- const: inside-secure,safexcel-eip197b
@@ -80,7 +81,9 @@ allOf:
8081
compatible:
8182
not:
8283
contains:
83-
const: mediatek,mt7986-crypto
84+
enum:
85+
- mediatek,mt7981-crypto
86+
- mediatek,mt7986-crypto
8487
then:
8588
properties:
8689
interrupts:

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ properties:
1313
compatible:
1414
items:
1515
- enum:
16+
- qcom,eliza-inline-crypto-engine
1617
- qcom,kaanapali-inline-crypto-engine
1718
- qcom,milos-inline-crypto-engine
1819
- qcom,qcs8300-inline-crypto-engine
@@ -31,6 +32,11 @@ properties:
3132
clocks:
3233
maxItems: 1
3334

35+
operating-points-v2: true
36+
37+
opp-table:
38+
type: object
39+
3440
required:
3541
- compatible
3642
- reg
@@ -47,5 +53,26 @@ examples:
4753
"qcom,inline-crypto-engine";
4854
reg = <0x01d88000 0x8000>;
4955
clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
56+
57+
operating-points-v2 = <&ice_opp_table>;
58+
59+
ice_opp_table: opp-table {
60+
compatible = "operating-points-v2";
61+
62+
opp-100000000 {
63+
opp-hz = /bits/ 64 <100000000>;
64+
required-opps = <&rpmhpd_opp_low_svs>;
65+
};
66+
67+
opp-201500000 {
68+
opp-hz = /bits/ 64 <201500000>;
69+
required-opps = <&rpmhpd_opp_svs_l1>;
70+
};
71+
72+
opp-403000000 {
73+
opp-hz = /bits/ 64 <403000000>;
74+
required-opps = <&rpmhpd_opp_nom>;
75+
};
76+
};
5077
};
5178
...

‎Documentation/devicetree/bindings/rng/atmel,at91-trng.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- microchip,sam9x60-trng
2020
- items:
2121
- enum:
22+
- microchip,lan9691-trng
2223
- microchip,sama7g5-trng
2324
- const: atmel,at91sam9g45-trng
2425
- items:

‎MAINTAINERS‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2909,7 +2909,6 @@ F: include/linux/soc/ixp4xx/qmgr.h
29092909

29102910
ARM/INTEL KEEMBAY ARCHITECTURE
29112911
M: Paul J. Murphy <paul.j.murphy@intel.com>
2912-
M: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
29132912
S: Maintained
29142913
F: Documentation/devicetree/bindings/arm/intel,keembay.yaml
29152914
F: arch/arm64/boot/dts/intel/keembay-evm.dts
@@ -6838,12 +6837,6 @@ L: linux-crypto@vger.kernel.org
68386837
S: Maintained
68396838
F: tools/crypto/tcrypt/tcrypt_speed_compare.py
68406839

6841-
CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
6842-
M: Neil Horman <nhorman@tuxdriver.com>
6843-
L: linux-crypto@vger.kernel.org
6844-
S: Maintained
6845-
F: crypto/rng.c
6846-
68476840
CS3308 MEDIA DRIVER
68486841
M: Hans Verkuil <hverkuil@kernel.org>
68496842
L: linux-media@vger.kernel.org
@@ -12956,7 +12949,6 @@ F: drivers/dma/ioat*
1295612949
INTEL IAA CRYPTO DRIVER
1295712950
M: Kristen Accardi <kristen.c.accardi@intel.com>
1295812951
M: Vinicius Costa Gomes <vinicius.gomes@intel.com>
12959-
M: Kanchana P Sridhar <kanchana.p.sridhar@intel.com>
1296012952
L: linux-crypto@vger.kernel.org
1296112953
S: Supported
1296212954
F: Documentation/driver-api/crypto/iaa/iaa-crypto.rst
@@ -13064,8 +13056,7 @@ F: Documentation/devicetree/bindings/display/intel,keembay-display.yaml
1306413056
F: drivers/gpu/drm/kmb/
1306513057

1306613058
INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
13067-
M: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
13068-
S: Maintained
13059+
S: Orphan
1306913060
F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
1307013061
F: drivers/crypto/intel/keembay/Kconfig
1307113062
F: drivers/crypto/intel/keembay/Makefile
@@ -13074,7 +13065,6 @@ F: drivers/crypto/intel/keembay/ocs-aes.c
1307413065
F: drivers/crypto/intel/keembay/ocs-aes.h
1307513066

1307613067
INTEL KEEM BAY OCS ECC CRYPTO DRIVER
13077-
M: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
1307813068
M: Prabhjot Khurana <prabhjot.khurana@intel.com>
1307913069
M: Mark Gross <mgross@linux.intel.com>
1308013070
S: Maintained
@@ -13084,7 +13074,6 @@ F: drivers/crypto/intel/keembay/Makefile
1308413074
F: drivers/crypto/intel/keembay/keembay-ocs-ecc.c
1308513075

1308613076
INTEL KEEM BAY OCS HCU CRYPTO DRIVER
13087-
M: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
1308813077
M: Declan Murphy <declan.murphy@intel.com>
1308913078
S: Maintained
1309013079
F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
@@ -17295,6 +17284,12 @@ S: Supported
1729517284
F: Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
1729617285
F: drivers/spi/spi-at91-usart.c
1729717286

17287+
MICROCHIP ATSHA204A DRIVER
17288+
M: Thorsten Blum <thorsten.blum@linux.dev>
17289+
L: linux-crypto@vger.kernel.org
17290+
S: Maintained
17291+
F: drivers/crypto/atmel-sha204a.c
17292+
1729817293
MICROCHIP AUDIO ASOC DRIVERS
1729917294
M: Claudiu Beznea <claudiu.beznea@tuxon.dev>
1730017295
M: Andrei Simion <andrei.simion@microchip.com>
@@ -17314,9 +17309,10 @@ F: Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
1731417309
F: drivers/media/platform/microchip/microchip-csi2dc.c
1731517310

1731617311
MICROCHIP ECC DRIVER
17312+
M: Thorsten Blum <thorsten.blum@linux.dev>
1731717313
L: linux-crypto@vger.kernel.org
17318-
S: Orphan
17319-
F: drivers/crypto/atmel-ecc.*
17314+
S: Maintained
17315+
F: drivers/crypto/atmel-ecc.c
1732017316

1732117317
MICROCHIP EIC DRIVER
1732217318
M: Claudiu Beznea <claudiu.beznea@tuxon.dev>

‎arch/s390/configs/debug_defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
808808
CONFIG_CRYPTO_USER_API_RNG=m
809809
CONFIG_CRYPTO_USER_API_AEAD=m
810810
CONFIG_CRYPTO_AES_S390=m
811-
CONFIG_CRYPTO_DES_S390=m
812811
CONFIG_CRYPTO_HMAC_S390=m
813812
CONFIG_ZCRYPT=m
814813
CONFIG_PKEY=m

0 commit comments

Comments
 (0)