Commit aec2f682 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 8801e23b 8879a3c1

Documentation/ABI/testing/debugfs-hisi-hpre

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ Description: Dump debug registers from the QM. 
		Available for PF and VF in host. VF in guest currently only

		has one debug register.



What:		/sys/kernel/debug/hisi_hpre/<bdf>/dev_usage

Date:		Mar 2026

Contact:	linux-crypto@vger.kernel.org

Description:	Query the real-time bandwidth usage of device.

		Returns the bandwidth usage of each channel on the device.

		The returned number is in percentage.



What:		/sys/kernel/debug/hisi_hpre/<bdf>/qm/current_q

Date:		Sep 2019

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-sec

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ Description: The <bdf> is related the function for PF and VF. 
		1/1000~1000/1000 of total QoS. The driver reading alg_qos to

		get related QoS in the host and VM, Such as "cat alg_qos".



What:		/sys/kernel/debug/hisi_sec2/<bdf>/dev_usage

Date:		Mar 2026

Contact:	linux-crypto@vger.kernel.org

Description:	Query the real-time bandwidth usage of device.

		Returns the bandwidth usage of each channel on the device.

		The returned number is in percentage.



What:		/sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_regs

Date:		Oct 2019

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-zip

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ Description: The <bdf> is related the function for PF and VF. 
		1/1000~1000/1000 of total QoS. The driver reading alg_qos to

		get related QoS in the host and VM, Such as "cat alg_qos".



What:		/sys/kernel/debug/hisi_zip/<bdf>/dev_usage

Date:		Mar 2026

Contact:	linux-crypto@vger.kernel.org

Description:	Query the real-time bandwidth usage of device.

		Returns the bandwidth usage of each channel on the device.

		The returned number is in percentage.



What:		/sys/kernel/debug/hisi_zip/<bdf>/qm/regs

Date:		Nov 2018

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/sysfs-driver-qat_svn

0 → 100644
+114 −0
Original line number Diff line number Diff line 
What:		/sys/bus/pci/devices/<BDF>/qat_svn/

Date:		June 2026

KernelVersion:	7.1

Contact:	qat-linux@intel.com

Description:	Directory containing Security Version Number (SVN) attributes for

		the Anti-Rollback (ARB) feature. The ARB feature prevents downloading

		older firmware versions to the acceleration device.



What:		/sys/bus/pci/devices/<BDF>/qat_svn/enforced_min

Date:		June 2026

KernelVersion:	7.1

Contact:	qat-linux@intel.com

Description:

		(RO) Reports the minimum allowed firmware SVN.



		Returns an integer greater than zero. Firmware with SVN lower than

		this value is rejected.



		A write to qat_svn/commit will update this value. The update is not

		persistent across reboot; on reboot, this value is reset from

		qat_svn/permanent_min.



		Example usage::



			# cat /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min

			2



		This attribute is available only on devices that support

		Anti-Rollback.



What:		/sys/bus/pci/devices/<BDF>/qat_svn/permanent_min

Date:		June 2026

KernelVersion:	7.1

Contact:	qat-linux@intel.com

Description:

		(RO) Reports the persistent minimum SVN used to initialize

		qat_svn/enforced_min on each reboot.



		Returns an integer greater than zero. A write to qat_svn/commit

		may update this value, depending on platform/BIOS settings.



		Example usage::



			# cat /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min

			3



		This attribute is available only on devices that support

		Anti-Rollback.



What:		/sys/bus/pci/devices/<BDF>/qat_svn/active

Date:		June 2026

KernelVersion:	7.1

Contact:	qat-linux@intel.com

Description:

		(RO) Reports the SVN of the currently active firmware image.



		Returns an integer greater than zero.



		Example usage::



			# cat /sys/bus/pci/devices/<BDF>/qat_svn/active

			2



		This attribute is available only on devices that support

		Anti-Rollback.



What:		/sys/bus/pci/devices/<BDF>/qat_svn/commit

Date:		June 2026

KernelVersion:	7.1

Contact:	qat-linux@intel.com

Description:

		(WO) Commits the currently active SVN as the minimum allowed SVN.



		Writing 1 sets qat_svn/enforced_min to the value of qat_svn/active,

		preventing future firmware loads with lower SVN.



		Depending on platform/BIOS settings, a commit may also update

		qat_svn/permanent_min.



		Note that on reboot, qat_svn/enforced_min reverts to

		qat_svn/permanent_min.



		It is advisable to use this attribute with caution, only when

		it is necessary to set a new minimum SVN for the firmware.



		Before committing the SVN update, it is crucial to check the

		current values of qat_svn/active, qat_svn/enforced_min and

		qat_svn/permanent_min. This verification helps ensure that the

		commit operation aligns with the intended outcome.



		While writing to the file, any value other than '1' will result

		in an error and have no effect.



		Example usage::



			## Read current values

			# cat /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min

			2

			# cat /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min

			2

			# cat /sys/bus/pci/devices/<BDF>/qat_svn/active

			3



			## Commit active SVN

			# echo 1 > /sys/bus/pci/devices/<BDF>/qat_svn/commit



			## Read updated values

			# cat /sys/bus/pci/devices/<BDF>/qat_svn/enforced_min

			3

			# cat /sys/bus/pci/devices/<BDF>/qat_svn/permanent_min

			3



		This attribute is available only on devices that support

		Anti-Rollback.

Documentation/crypto/userspace-if.rst

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ user space, however. This includes the difference between synchronous 
and asynchronous invocations. The user space API call is fully

synchronous.



[1] https://www.chronox.de/libkcapi.html

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



User Space API General Remarks

------------------------------
@@ -406,4 +406,4 @@ Please see [1] for libkcapi which provides an easy-to-use wrapper around 
the aforementioned Netlink kernel interface. [1] also contains a test

application that invokes all libkcapi API calls.



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