From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Dec 2020 20:18:19 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: accepted/tizen/unified/20230118.172025~8351
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e4b0d55d84a66dbfede56890501dc96e696059c;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull crypto updates from Herbert Xu:
 "API:
   - Add speed testing on 1420-byte blocks for networking

  Algorithms:
   - Improve performance of chacha on ARM for network packets
   - Improve performance of aegis128 on ARM for network packets

  Drivers:
   - Add support for Keem Bay OCS AES/SM4
   - Add support for QAT 4xxx devices
   - Enable crypto-engine retry mechanism in caam
   - Enable support for crypto engine on sdm845 in qce
   - Add HiSilicon PRNG driver support"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (161 commits)
  crypto: qat - add capability detection logic in qat_4xxx
  crypto: qat - add AES-XTS support for QAT GEN4 devices
  crypto: qat - add AES-CTR support for QAT GEN4 devices
  crypto: atmel-i2c - select CONFIG_BITREVERSE
  crypto: hisilicon/trng - replace atomic_add_return()
  crypto: keembay - Add support for Keem Bay OCS AES/SM4
  dt-bindings: Add Keem Bay OCS AES bindings
  crypto: aegis128 - avoid spurious references crypto_aegis128_update_simd
  crypto: seed - remove trailing semicolon in macro definition
  crypto: x86/poly1305 - Use TEST %reg,%reg instead of CMP $0,%reg
  crypto: x86/sha512 - Use TEST %reg,%reg instead of CMP $0,%reg
  crypto: aesni - Use TEST %reg,%reg instead of CMP $0,%reg
  crypto: cpt - Fix sparse warnings in cptpf
  hwrng: ks-sa - Add dependency on IOMEM and OF
  crypto: lib/blake2s - Move selftest prototype into header file
  crypto: arm/aes-ce - work around Cortex-A57/A72 silion errata
  crypto: ecdh - avoid unaligned accesses in ecdh_set_secret()
  crypto: ccree - rework cache parameters handling
  crypto: cavium - Use dma_set_mask_and_coherent to simplify code
  crypto: marvell/octeontx - Use dma_set_mask_and_coherent to simplify code
  ...
---

9e4b0d55d84a66dbfede56890501dc96e696059c
diff --cc MAINTAINERS
index 80881fb,3f81dd8..fb75813
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8975,13 -8958,16 +8975,23 @@@ M:	Deepak Saxena <dsaxena@plexity.net
  S:	Maintained
  F:	drivers/char/hw_random/ixp4xx-rng.c
  
- INTEL KEEMBAY DRM DRIVER
++INTEL KEEM BAY DRM DRIVER
 +M:	Anitha Chrisanthus <anitha.chrisanthus@intel.com>
 +M:	Edmund Dea <edmund.j.dea@intel.com>
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/display/intel,kmb_display.yaml
 +F:	drivers/gpu/drm/kmb/
 +
+ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
+ M:	Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
+ F:	drivers/crypto/keembay/Kconfig
+ F:	drivers/crypto/keembay/Makefile
+ F:	drivers/crypto/keembay/keembay-ocs-aes-core.c
+ F:	drivers/crypto/keembay/ocs-aes.c
+ F:	drivers/crypto/keembay/ocs-aes.h
+ 
  INTEL MANAGEMENT ENGINE (mei)
  M:	Tomas Winkler <tomas.winkler@intel.com>
  L:	linux-kernel@vger.kernel.org