From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2017 22:53:46 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a0387a8a8efb90ae7fea1e2e5c62de3efa74691;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.12:

  API:
   - Add batch registration for acomp/scomp
   - Change acomp testing to non-unique compressed result
   - Extend algorithm name limit to 128 bytes
   - Require setkey before accept(2) in algif_aead

  Algorithms:
   - Add support for deflate rfc1950 (zlib)

  Drivers:
   - Add accelerated crct10dif for powerpc
   - Add crc32 in stm32
   - Add sha384/sha512 in ccp
   - Add 3des/gcm(aes) for v5 devices in ccp
   - Add Queue Interface (QI) backend support in caam
   - Add new Exynos RNG driver
   - Add ThunderX ZIP driver
   - Add driver for hardware random generator on MT7623 SoC"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (101 commits)
  crypto: stm32 - Fix OF module alias information
  crypto: algif_aead - Require setkey before accept(2)
  crypto: scomp - add support for deflate rfc1950 (zlib)
  crypto: scomp - allow registration of multiple scomps
  crypto: ccp - Change ISR handler method for a v5 CCP
  crypto: ccp - Change ISR handler method for a v3 CCP
  crypto: crypto4xx - rename ce_ring_contol to ce_ring_control
  crypto: testmgr - Allow ecb(cipher_null) in FIPS mode
  Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"
  crypto: ccp - Disable interrupts early on unload
  crypto: ccp - Use only the relevant interrupt bits
  hwrng: mtk - Add driver for hardware random generator on MT7623 SoC
  dt-bindings: hwrng: Add Mediatek hardware random generator bindings
  crypto: crct10dif-vpmsum - Fix missing preempt_disable()
  crypto: testmgr - replace compression known answer test
  crypto: acomp - allow registration of multiple acomps
  hwrng: n2 - Use devm_kcalloc() in n2rng_probe()
  crypto: chcr - Fix error handling related to 'chcr_alloc_shash'
  padata: get_next is never NULL
  crypto: exynos - Add new Exynos RNG driver
  ...
---

5a0387a8a8efb90ae7fea1e2e5c62de3efa74691
diff --cc drivers/char/hw_random/Kconfig
index b9918fb9587d,fd34121934e5..1b223c32a8ae
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -423,20 -409,20 +409,34 @@@ config HW_RANDOM_CAVIU
  
           If unsure, say Y.
  
+ config HW_RANDOM_MTK
+ 	tristate "Mediatek Random Number Generator support"
+ 	depends on HW_RANDOM
+ 	depends on ARCH_MEDIATEK || COMPILE_TEST
+ 	default y
+ 	---help---
+ 	  This driver provides kernel-side support for the Random Number
+ 	  Generator hardware found on Mediatek SoCs.
+ 
+ 	  To compile this driver as a module, choose M here. the
+ 	  module will be called mtk-rng.
+ 
+ 	  If unsure, say Y.
+ 
 +config HW_RANDOM_S390
 +	tristate "S390 True Random Number Generator support"
 +	depends on S390
 +	default HW_RANDOM
 +	---help---
 +	  This driver provides kernel-side support for the True
 +	  Random Number Generator available as CPACF extension
 +	  on modern s390 hardware platforms.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called s390-trng.
 +
 +	  If unsure, say Y.
 +
  endif # HW_RANDOM
  
  config UML_RANDOM
diff --cc drivers/char/hw_random/Makefile
index dd1765246255,de6ea808bd3c..b085975ec1d2
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@@ -36,4 -35,4 +35,5 @@@ obj-$(CONFIG_HW_RANDOM_STM32) += stm32-
  obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
  obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
  obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
+ obj-$(CONFIG_HW_RANDOM_MTK)	+= mtk-rng.o
 +obj-$(CONFIG_HW_RANDOM_S390) += s390-trng.o