Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

Pull sparc updates from David Miller:
 "Largely this is simply adding support for the Niagara 4 cpu.

  Major areas are perf events (chip now supports 4 counters and can
  monitor any event on each counter), crypto (opcodes are availble for
  sha1, sha256, sha512, md5, crc32c, AES, DES, CAMELLIA, and Kasumi
  although the last is unsupported since we lack a generic crypto layer
  Kasumi implementation), and an optimized memcpy.

  Finally some cleanups by Peter Senna Tschudin."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (47 commits)
  sparc64: Fix trailing whitespace in NG4 memcpy.
  sparc64: Fix comment type in NG4 copy from user.
  sparc64: Add SPARC-T4 optimized memcpy.
  drivers/sbus/char: removes unnecessary semicolon
  arch/sparc/kernel/pci_sun4v.c: removes unnecessary semicolon
  sparc64: Fix function argument comment in camellia_sparc64_key_expand asm.
  sparc64: Fix IV handling bug in des_sparc64_cbc_decrypt
  sparc64: Add auto-loading mechanism to crypto-opcode drivers.
  sparc64: Add missing pr_fmt define to crypto opcode drivers.
  sparc64: Adjust crypto priorities.
  sparc64: Use cpu_pgsz_mask for linear kernel mapping config.
  sparc64: Probe cpu page size support more portably.
  sparc64: Support 2GB and 16GB page sizes for kernel linear mappings.
  sparc64: Fix bugs in unrolled 256-bit loops.
  sparc64: Avoid code duplication in crypto assembler.
  sparc64: Unroll CTR crypt loops in AES driver.
  sparc64: Unroll ECB decryption loops in AES driver.
  sparc64: Unroll ECB encryption loops in AES driver.
  sparc64: Add ctr mode support to AES driver.
  sparc64: Move AES driver over to a methods based implementation.
  ...

1 files changed, 97 insertions, 0 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index a3238051b03e..94f232f96d03 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -336,6 +336,15 @@ config CRYPTO_CRC32C_INTEL
           gain performance compared with software implementation.
           Module will be crc32c-intel.
 
+config CRYPTO_CRC32C_SPARC64
+        tristate "CRC32c CRC algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_HASH
+        select CRC32
+        help
+          CRC32c CRC algorithm implemented using sparc64 crypto instructions,
+          when available.
+
 config CRYPTO_GHASH
         tristate "GHASH digest algorithm"
         select CRYPTO_GF128MUL
@@ -354,6 +363,15 @@ config CRYPTO_MD5
         help
           MD5 message digest algorithm (RFC1321).
 
+config CRYPTO_MD5_SPARC64
+        tristate "MD5 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_MD5
+        select CRYPTO_HASH
+        help
+          MD5 message digest algorithm (RFC1321) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_MICHAEL_MIC
         tristate "Michael MIC keyed digest algorithm"
         select CRYPTO_HASH
@@ -433,6 +451,15 @@ config CRYPTO_SHA1_SSSE3
           using Supplemental SSE3 (SSSE3) instructions or Advanced Vector
           Extensions (AVX), when available.
 
+config CRYPTO_SHA1_SPARC64
+        tristate "SHA1 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA1
+        select CRYPTO_HASH
+        help
+          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_SHA256
         tristate "SHA224 and SHA256 digest algorithm"
         select CRYPTO_HASH
@@ -445,6 +472,15 @@ config CRYPTO_SHA256
           This code also includes SHA-224, a 224 bit hash with 112 bits
           of security against collision attacks.
 
+config CRYPTO_SHA256_SPARC64
+        tristate "SHA224 and SHA256 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA256
+        select CRYPTO_HASH
+        help
+          SHA-256 secure hash standard (DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_SHA512
         tristate "SHA384 and SHA512 digest algorithms"
         select CRYPTO_HASH
@@ -457,6 +493,15 @@ config CRYPTO_SHA512
           This code also includes SHA-384, a 384 bit hash with 192 bits
           of security against collision attacks.
 
+config CRYPTO_SHA512_SPARC64
+        tristate "SHA384 and SHA512 digest algorithm (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_SHA512
+        select CRYPTO_HASH
+        help
+          SHA-512 secure hash standard (DFIPS 180-2) implemented
+          using sparc64 crypto instructions, when available.
+
 config CRYPTO_TGR192
         tristate "Tiger digest algorithms"
         select CRYPTO_HASH
@@ -588,6 +633,34 @@ config CRYPTO_AES_NI_INTEL
           ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
           acceleration for CTR.
 
+config CRYPTO_AES_SPARC64
+        tristate "AES cipher algorithms (SPARC64)"
+        depends on SPARC64
+        select CRYPTO_CRYPTD
+        select CRYPTO_ALGAPI
+        help
+          Use SPARC64 crypto opcodes for AES algorithm.
+
+          AES cipher algorithms (FIPS-197). AES uses the Rijndael
+          algorithm.
+
+          Rijndael appears to be consistently a very good performer in
+          both hardware and software across a wide range of computing
+          environments regardless of its use in feedback or non-feedback
+          modes. Its key setup time is excellent, and its key agility is
+          good. Rijndael's very low memory requirements make it very well
+          suited for restricted-space environments, in which it also
+          demonstrates excellent performance. Rijndael's operations are
+          among the easiest to defend against power and timing attacks.
+
+          The AES specifies three key sizes: 128, 192 and 256 bits
+
+          See <http://csrc.nist.gov/encryption/aes/> for more information.
+
+          In addition to AES cipher algorithm support, the acceleration
+          for some popular block cipher mode is supported too, including
+          ECB and CBC.
+
 config CRYPTO_ANUBIS
         tristate "Anubis cipher algorithm"
         select CRYPTO_ALGAPI
@@ -685,6 +758,22 @@ config CRYPTO_CAMELLIA_X86_64
           See also:
           <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
+config CRYPTO_CAMELLIA_SPARC64
+        tristate "Camellia cipher algorithm (SPARC64)"
+        depends on SPARC64
+        depends on CRYPTO
+        select CRYPTO_ALGAPI
+        help
+          Camellia cipher algorithm module (SPARC64).
+
+          Camellia is a symmetric key block cipher developed jointly
+          at NTT and Mitsubishi Electric Corporation.
+
+          The Camellia specifies three key sizes: 128, 192 and 256 bits.
+
+          See also:
+          <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
+
 config CRYPTO_CAST5
         tristate "CAST5 (CAST-128) cipher algorithm"
         select CRYPTO_ALGAPI
@@ -705,6 +794,14 @@ config CRYPTO_DES
         help
           DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
+config CRYPTO_DES_SPARC64
+        tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
+        select CRYPTO_ALGAPI
+        select CRYPTO_DES
+        help
+          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),
+          optimized using SPARC64 crypto opcodes.
+
 config CRYPTO_FCRYPT
         tristate "FCrypt cipher algorithm"
         select CRYPTO_ALGAPI