Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull more s390 updates from Martin Schwidefsky:
 "Next to the usual bug fixes (including the TASK_SIZE fix), there is
  one larger crypto item. It allows to use protected keys with the
  in-kernel crypto API

  The protected key support has two parts, the pkey user space API to
  convert key formats and the paes crypto module that uses a protected
  key instead of a standard AES key"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: TASK_SIZE for kernel threads
  s390/crypt: Add protected key AES module
  s390/dasd: fix spelling mistake: "supportet" -> "supported"
  s390/pkey: Introduce pkey kernel module
  s390/zcrypt: export additional symbols
  s390/zcrypt: Rework CONFIG_ZCRYPT Kconfig text.
  s390/zcrypt: Cleanup leftover module code.
  s390/nmi: purge tlbs after control register validation
  s390/nmi: fix order of register validation
  s390/crypto: Add PCKMO inline function
  s390/zcrypt: Enable request count reset for cards and queues.
  s390/mm: use _SEGMENT_ENTRY_EMPTY in the code
  s390/chsc: Add exception handler for CHSC instruction
  s390: opt into HAVE_COPY_THREAD_TLS
  s390: restore address space when returning to user space
  s390: rename CIF_ASCE to CIF_ASCE_PRIMARY

diff --combined arch/s390/Kconfig
index d5c1073a2584cc383765a97048ec6e872e4546f1,7deadbb8a9fed9ca29ae40be8032f1fa280a769e..a2dcef0aacc76db2d318e7b8785f9f8dadbca02d
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -134,10 -134,10 +134,11 @@@ config S39
        select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_CMPXCHG_LOCAL
+       select HAVE_COPY_THREAD_TLS
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_CONTIGUOUS
 +      select DMA_NOOP_OPS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
        select HAVE_EFFICIENT_UNALIGNED_ACCESS

diff --combined drivers/crypto/Kconfig
index 2cac445b02fde0f626946d2dd0021322bcef07c4,9355660cf2433a30910555e044fe83c90b2d53ef..0b49dbc423e2449545d6a61b6a212454eef64f05
--- 1/drivers/crypto/Kconfig
--- 2/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@@ -62,19 -62,32 +62,32 @@@ config CRYPTO_DEV_GEOD
          will be called geode-aes.
  
  config ZCRYPT
-       tristate "Support for PCI-attached cryptographic adapters"
+       tristate "Support for s390 cryptographic adapters"
        depends on S390
        select HW_RANDOM
        help
-         Select this option if you want to use a PCI-attached cryptographic
-         adapter like:
-         + PCI Cryptographic Accelerator (PCICA)
-         + PCI Cryptographic Coprocessor (PCICC)
+         Select this option if you want to enable support for
+         s390 cryptographic adapters like:
          + PCI-X Cryptographic Coprocessor (PCIXCC)
-         + Crypto Express2 Coprocessor (CEX2C)
-         + Crypto Express2 Accelerator (CEX2A)
-         + Crypto Express3 Coprocessor (CEX3C)
-         + Crypto Express3 Accelerator (CEX3A)
+         + Crypto Express 2,3,4 or 5 Coprocessor (CEXxC)
+         + Crypto Express 2,3,4 or 5 Accelerator (CEXxA)
+         + Crypto Express 4 or 5 EP11 Coprocessor (CEXxP)
+ 
+ config PKEY
+       tristate "Kernel API for protected key handling"
+       depends on S390
+       depends on ZCRYPT
+       help
+         With this option enabled the pkey kernel module provides an API
+         for creation and handling of protected keys. Other parts of the
+         kernel or userspace applications may use these functions.
+ 
+         Select this option if you want to enable the kernel and userspace
+         API for proteced key handling.
+ 
+         Please note that creation of protected keys from secure keys
+         requires to have at least one CEX card in coprocessor mode
+         available at runtime.
  
  config CRYPTO_SHA1_S390
        tristate "SHA1 digest algorithm"
@@@ -124,6 -137,7 +137,7 @@@ config CRYPTO_AES_S39
        depends on S390
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
+       select PKEY
        help
          This is the s390 hardware accelerated implementation of the
          AES cipher algorithms (FIPS-197).
@@@ -339,7 -353,7 +353,7 @@@ config CRYPTO_DEV_OMAP_DE
  
  config CRYPTO_DEV_PICOXCELL
        tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
 -      depends on ARCH_PICOXCELL && HAVE_CLK
 +      depends on (ARCH_PICOXCELL || COMPILE_TEST) && HAVE_CLK
        select CRYPTO_AEAD
        select CRYPTO_AES
        select CRYPTO_AUTHENC
@@@ -415,23 -429,10 +429,23 @@@ config CRYPTO_DEV_BFIN_CR
          Newer Blackfin processors have CRC hardware. Select this if you
          want to use the Blackfin CRC module.
  
 +config CRYPTO_DEV_ATMEL_AUTHENC
 +      tristate "Support for Atmel IPSEC/SSL hw accelerator"
 +      depends on HAS_DMA
 +      depends on ARCH_AT91 || COMPILE_TEST
 +      select CRYPTO_AUTHENC
 +      select CRYPTO_DEV_ATMEL_AES
 +      select CRYPTO_DEV_ATMEL_SHA
 +      help
 +        Some Atmel processors can combine the AES and SHA hw accelerators
 +        to enhance support of IPSEC/SSL.
 +        Select this if you want to use the Atmel modules for
 +        authenc(hmac(shaX),Y(cbc)) algorithms.
 +
  config CRYPTO_DEV_ATMEL_AES
        tristate "Support for Atmel AES hw accelerator"
        depends on HAS_DMA
 -      depends on AT_XDMAC || AT_HDMAC || COMPILE_TEST
 +      depends on ARCH_AT91 || COMPILE_TEST
        select CRYPTO_AES
        select CRYPTO_AEAD
        select CRYPTO_BLKCIPHER
@@@ -445,7 -446,7 +459,7 @@@
  
  config CRYPTO_DEV_ATMEL_TDES
        tristate "Support for Atmel DES/TDES hw accelerator"
 -      depends on ARCH_AT91
 +      depends on ARCH_AT91 || COMPILE_TEST
        select CRYPTO_DES
        select CRYPTO_BLKCIPHER
        help
@@@ -458,7 -459,7 +472,7 @@@
  
  config CRYPTO_DEV_ATMEL_SHA
        tristate "Support for Atmel SHA hw accelerator"
 -      depends on ARCH_AT91
 +      depends on ARCH_AT91 || COMPILE_TEST
        select CRYPTO_HASH
        help
          Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512
@@@ -497,7 -498,6 +511,7 @@@ config CRYPTO_DEV_MXS_DC
          will be called mxs-dcp.
  
  source "drivers/crypto/qat/Kconfig"
 +source "drivers/crypto/cavium/cpt/Kconfig"
  
  config CRYPTO_DEV_QCE
        tristate "Qualcomm crypto engine accelerator"
@@@ -567,39 -567,8 +581,39 @@@ config CRYPTO_DEV_ROCKCHI
          This driver interfaces with the hardware crypto accelerator.
          Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.
  
 +config CRYPTO_DEV_MEDIATEK
 +      tristate "MediaTek's EIP97 Cryptographic Engine driver"
 +      depends on (ARM && ARCH_MEDIATEK) || COMPILE_TEST
 +      select CRYPTO_AES
 +      select CRYPTO_AEAD
 +      select CRYPTO_BLKCIPHER
 +      select CRYPTO_CTR
 +      select CRYPTO_SHA1
 +      select CRYPTO_SHA256
 +      select CRYPTO_SHA512
 +      select CRYPTO_HMAC
 +      help
 +        This driver allows you to utilize the hardware crypto accelerator
 +        EIP97 which can be found on the MT7623 MT2701, MT8521p, etc ....
 +        Select this if you want to use it for AES/SHA1/SHA2 algorithms.
 +
  source "drivers/crypto/chelsio/Kconfig"
  
  source "drivers/crypto/virtio/Kconfig"
  
 +config CRYPTO_DEV_BCM_SPU
 +      tristate "Broadcom symmetric crypto/hash acceleration support"
 +      depends on ARCH_BCM_IPROC
 +      depends on BCM_PDC_MBOX
 +      default m
 +      select CRYPTO_DES
 +      select CRYPTO_MD5
 +      select CRYPTO_SHA1
 +      select CRYPTO_SHA256
 +      select CRYPTO_SHA512
 +      help
 +        This driver provides support for Broadcom crypto acceleration using the
 +        Secure Processing Unit (SPU). The SPU driver registers ablkcipher,
 +        ahash, and aead algorithms with the kernel cryptographic API.
 +
  endif # CRYPTO_HW