From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2022 01:06:49 +0000 (-0700)
Subject: Merge tag 'v5.19-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d075c0c1be279c5f4c6688ac0442fff6494e56bc;p=linux.git

Merge tag 'v5.19-p1' of git://git./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
  ...
---

d075c0c1be279c5f4c6688ac0442fff6494e56bc
diff --cc drivers/crypto/caam/Kconfig
index ea9f8b1ae981c,0aa52b612a018..ec6a9e6ad4d23
--- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig
@@@ -151,9 -151,14 +151,17 @@@ config CRYPTO_DEV_FSL_CAAM_RNG_AP
  	  Selecting this will register the SEC4 hardware rng to
  	  the hw_random API for supplying the kernel entropy pool.
  
+ config CRYPTO_DEV_FSL_CAAM_PRNG_API
+ 	bool "Register Pseudo random number generation implementation with Crypto API"
+ 	default y
+ 	select CRYPTO_RNG
+ 	help
+ 	  Selecting this will register the SEC hardware prng to
+ 	  the Crypto API.
+ 
 +config CRYPTO_DEV_FSL_CAAM_BLOB_GEN
 +	bool
 +
  endif # CRYPTO_DEV_FSL_CAAM_JR
  
  endif # CRYPTO_DEV_FSL_CAAM
diff --cc drivers/crypto/caam/Makefile
index 25f7ae5a4642e,4f9837a8a1ad7..acf1b197eb84b
--- a/drivers/crypto/caam/Makefile
+++ b/drivers/crypto/caam/Makefile
@@@ -20,8 -20,8 +20,9 @@@ caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CR
  caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI) += caamalg_qi.o
  caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API) += caamhash.o
  caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API) += caamrng.o
+ caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API) += caamprng.o
  caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API) += caampkc.o pkc_desc.o
 +caam_jr-$(CONFIG_CRYPTO_DEV_FSL_CAAM_BLOB_GEN) += blob_gen.o
  
  caam-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI) += qi.o
  ifneq ($(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI),)