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

Merge tag 'v5.19-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "API:

   - Test in-place en/decryption with two sglists in testmgr

   - Fix process vs softirq race in cryptd

  Algorithms:

   - Add arm64 acceleration for sm4

   - Add s390 acceleration for chacha20

  Drivers:

   - Add polarfire soc hwrng support in mpsf

   - Add support for TI SoC AM62x in sa2ul

   - Add support for ATSHA204 cryptochip in atmel-sha204a

   - Add support for PRNG in caam

   - Restore support for storage encryption in qat

   - Restore support for storage encryption in hisilicon/sec"

* tag 'v5.19-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
  hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume()
  crypto: hisilicon/sec - delete the flag CRYPTO_ALG_ALLOCATES_MEMORY
  crypto: qat - add support for 401xx devices
  crypto: qat - re-enable registration of algorithms
  crypto: qat - honor CRYPTO_TFM_REQ_MAY_SLEEP flag
  crypto: qat - add param check for DH
  crypto: qat - add param check for RSA
  crypto: qat - remove dma_free_coherent() for DH
  crypto: qat - remove dma_free_coherent() for RSA
  crypto: qat - fix memory leak in RSA
  crypto: qat - add backlog mechanism
  crypto: qat - refactor submission logic
  crypto: qat - use pre-allocated buffers in datapath
  crypto: qat - set to zero DH parameters before free
  crypto: s390 - add crypto library interface for ChaCha20
  crypto: talitos - Uniform coding style with defined variable
  crypto: octeontx2 - simplify the return expression of otx2_cpt_aead_cbc_aes_sha_setkey()
  crypto: cryptd - Protect per-CPU resource by disabling BH.
  crypto: sun8i-ce - do not fallback if cryptlen is less than sg length
  crypto: sun8i-ce - rework debugging
  ...
parents bf272460 e4e62bbc

Documentation/ABI/testing/debugfs-hisi-hpre

+14 −0
Original line number Diff line number Diff line
@@ -104,6 +104,20 @@ Description: Dump the status of the QM. 
		Four states: initiated, started, stopped and closed.

		Available for both PF and VF, and take no other effect on HPRE.



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

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

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>/hpre_dfx/diff_regs

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

Description:	HPRE debug registers(regs) read hardware register value. This

		node is used to show the change of the register values. This

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



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

Date:		Apr 2020

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-sec

+14 −0
Original line number Diff line number Diff line
@@ -84,6 +84,20 @@ Description: Dump the status of the QM. 
		Four states: initiated, started, stopped and closed.

		Available for both PF and VF, and take no other effect on SEC.



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

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

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>/sec_dfx/diff_regs

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

Description:	SEC debug registers(regs) read hardware register value. This

		node is used to show the change of the register values. This

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



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

Date:		Apr 2020

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-zip

+14 −0
Original line number Diff line number Diff line
@@ -97,6 +97,20 @@ Description: Dump the status of the QM. 
		Four states: initiated, started, stopped and closed.

		Available for both PF and VF, and take no other effect on ZIP.



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

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

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>/zip_dfx/diff_regs

Date:		Mar 2022

Contact:	linux-crypto@vger.kernel.org

Description:	ZIP debug registers(regs) read hardware register value. This

		node is used to show the change of the registers value. this

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



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

Date:		Apr 2020

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/sysfs-driver-ccp

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

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/fused_part file reports

		whether the CPU or APU has been fused to prevent tampering.

		0: Not fused

		1: Fused



What:		/sys/bus/pci/devices/<BDF>/debug_lock_on

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/debug_lock_on reports

		whether the AMD CPU or APU has been unlocked for debugging.

		Possible values:

		0: Not locked

		1: Locked



What:		/sys/bus/pci/devices/<BDF>/tsme_status

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/tsme_status file reports

		the status of transparent secure memory encryption on AMD systems.

		Possible values:

		0: Not active

		1: Active



What:		/sys/bus/pci/devices/<BDF>/anti_rollback_status

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/anti_rollback_status file reports

		whether the PSP is enforcing rollback protection.

		Possible values:

		0: Not enforcing

		1: Enforcing



What:		/sys/bus/pci/devices/<BDF>/rpmc_production_enabled

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/rpmc_production_enabled file reports

		whether Replay Protected Monotonic Counter support has been enabled.

		Possible values:

		0: Not enabled

		1: Enabled



What:		/sys/bus/pci/devices/<BDF>/rpmc_spirom_available

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/rpmc_spirom_available file reports

		whether an Replay Protected Monotonic Counter supported SPI is installed

		on the system.

		Possible values:

		0: Not present

		1: Present



What:		/sys/bus/pci/devices/<BDF>/hsp_tpm_available

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/hsp_tpm_available file reports

		whether the HSP TPM has been activated.

		Possible values:

		0: Not activated or present

		1: Activated



What:		/sys/bus/pci/devices/<BDF>/rom_armor_enforced

Date:		June 2022

KernelVersion:	5.19

Contact:	mario.limonciello@amd.com

Description:

		The /sys/bus/pci/devices/<BDF>/rom_armor_enforced file reports

		whether RomArmor SPI protection is enforced.

		Possible values:

		0: Not enforced

		1: Enforced

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ properties: 
      - ti,j721e-sa2ul

      - ti,am654-sa2ul

      - ti,am64-sa2ul

      - ti,am62-sa3ul



  reg:

    maxItems: 1