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

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
  ...
parents 4138f022 6a8dbd71

Documentation/ABI/testing/debugfs-driver-qat

+26 −0
Original line number Diff line number Diff line
@@ -81,3 +81,29 @@ Description: (RO) Read returns, for each Acceleration Engine (AE), the number 
			<N>: Number of Compress and Verify (CnV) errors and type

			     of the last CnV error detected by Acceleration

			     Engine N.



What:		/sys/kernel/debug/qat_<device>_<BDF>/heartbeat/inject_error

Date:		March 2024

KernelVersion:	6.8

Contact:	qat-linux@intel.com

Description:	(WO) Write to inject an error that simulates an heartbeat

		failure. This is to be used for testing purposes.



		After writing this file, the driver stops arbitration on a

		random engine and disables the fetching of heartbeat counters.

		If a workload is running on the device, a job submitted to the

		accelerator might not get a response and a read of the

		`heartbeat/status` attribute might report -1, i.e. device

		unresponsive.

		The error is unrecoverable thus the device must be restarted to

		restore its functionality.



		This attribute is available only when the kernel is built with

		CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION=y.



		A write of 1 enables error injection.



		The following example shows how to enable error injection::



			# cd /sys/kernel/debug/qat_<device>_<BDF>

			# echo 1 > heartbeat/inject_error

Documentation/ABI/testing/debugfs-hisi-hpre

+22 −0
Original line number Diff line number Diff line
@@ -111,6 +111,28 @@ Description: QM debug registers(regs) read hardware register value. This 
		node is used to show the change of the qm register values. This

		node can be help users to check the change of register values.



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

Date:		Jan 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Dump the state of the device.

		0: busy, 1: idle.

		Only available for PF, and take no other effect on HPRE.



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

Date:		Feb 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Set the wait time when stop queue fails. Available for both PF

		and VF, and take no other effect on HPRE.

		0: not wait(default), others value: wait dev_timeout * 20 microsecond.



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

Date:		Feb 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Dump the stop queue status of the QM. The default value is 0,

		if dev_timeout is set, when stop queue fails, the dev_state

		will return non-zero value. Available for both PF and VF,

		and take no other effect on HPRE.



What:		/sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/diff_regs

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-sec

+22 −0
Original line number Diff line number Diff line
@@ -91,6 +91,28 @@ Description: QM debug registers(regs) read hardware register value. This 
		node is used to show the change of the qm register values. This

		node can be help users to check the change of register values.



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

Date:		Jan 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Dump the state of the device.

		0: busy, 1: idle.

		Only available for PF, and take no other effect on SEC.



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

Date:		Feb 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Set the wait time when stop queue fails. Available for both PF

		and VF, and take no other effect on SEC.

		0: not wait(default), others value: wait dev_timeout * 20 microsecond.



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

Date:		Feb 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Dump the stop queue status of the QM. The default value is 0,

		if dev_timeout is set, when stop queue fails, the dev_state

		will return non-zero value. Available for both PF and VF,

		and take no other effect on SEC.



What:		/sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/diff_regs

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-zip

+22 −0
Original line number Diff line number Diff line
@@ -104,6 +104,28 @@ Description: QM debug registers(regs) read hardware register value. This 
		node is used to show the change of the qm registers value. This

		node can be help users to check the change of register values.



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

Date:		Jan 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Dump the state of the device.

		0: busy, 1: idle.

		Only available for PF, and take no other effect on ZIP.



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

Date:		Feb 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Set the wait time when stop queue fails. Available for both PF

		and VF, and take no other effect on ZIP.

		0: not wait(default), others value: wait dev_timeout * 20 microsecond.



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

Date:		Feb 2024

Contact:	linux-crypto@vger.kernel.org

Description:	Dump the stop queue status of the QM. The default value is 0,

		if dev_timeout is set, when stop queue fails, the dev_state

		will return non-zero value. Available for both PF and VF,

		and take no other effect on ZIP.



What:		/sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/diff_regs

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/sysfs-driver-qat

+20 −0
Original line number Diff line number Diff line
@@ -141,3 +141,23 @@ Description: 
			64



		This attribute is only available for qat_4xxx devices.



What:		/sys/bus/pci/devices/<BDF>/qat/auto_reset

Date:		March 2024

KernelVersion:	6.8

Contact:	qat-linux@intel.com

Description:	(RW) Reports the current state of the autoreset feature

		for a QAT device



		Write to the attribute to enable or disable device auto reset.



		Device auto reset is disabled by default.



		The values are:



		* 1/Yy/on: auto reset enabled. If the device encounters an

		  unrecoverable error, it will be reset automatically.

		* 0/Nn/off: auto reset disabled. If the device encounters an

		  unrecoverable error, it will not be reset.



		This attribute is only available for qat_4xxx devices.