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

Pull crypto updates from Herbert Xu:
 "API:
   - Enforce the setting of keys for keyed aead/hash/skcipher
     algorithms.
   - Add multibuf speed tests in tcrypt.

  Algorithms:
   - Improve performance of sha3-generic.
   - Add native sha512 support on arm64.
   - Add v8.2 Crypto Extentions version of sha3/sm3 on arm64.
   - Avoid hmac nesting by requiring underlying algorithm to be unkeyed.
   - Add cryptd_max_cpu_qlen module parameter to cryptd.

  Drivers:
   - Add support for EIP97 engine in inside-secure.
   - Add inline IPsec support to chelsio.
   - Add RevB core support to crypto4xx.
   - Fix AEAD ICV check in crypto4xx.
   - Add stm32 crypto driver.
   - Add support for BCM63xx platforms in bcm2835 and remove bcm63xx.
   - Add Derived Key Protocol (DKP) support in caam.
   - Add Samsung Exynos True RNG driver.
   - Add support for Exynos5250+ SoCs in exynos PRNG driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (166 commits)
  crypto: picoxcell - Fix error handling in spacc_probe()
  crypto: arm64/sha512 - fix/improve new v8.2 Crypto Extensions code
  crypto: arm64/sm3 - new v8.2 Crypto Extensions implementation
  crypto: arm64/sha3 - new v8.2 Crypto Extensions implementation
  crypto: testmgr - add new testcases for sha3
  crypto: sha3-generic - export init/update/final routines
  crypto: sha3-generic - simplify code
  crypto: sha3-generic - rewrite KECCAK transform to help the compiler optimize
  crypto: sha3-generic - fixes for alignment and big endian operation
  crypto: aesni - handle zero length dst buffer
  crypto: artpec6 - remove select on non-existing CRYPTO_SHA384
  hwrng: bcm2835 - Remove redundant dev_err call in bcm2835_rng_probe()
  crypto: stm32 - remove redundant dev_err call in stm32_cryp_probe()
  crypto: axis - remove unnecessary platform_get_resource() error check
  crypto: testmgr - test misuse of result in ahash
  crypto: inside-secure - make function safexcel_try_push_requests static
  crypto: aes-generic - fix aes-generic regression on powerpc
  crypto: chelsio - Fix indentation warning
  crypto: arm64/sha1-ce - get rid of literal pool
  crypto: arm64/sha2-ce - move the round constant table to .rodata section
  ...

1 files changed, 4 insertions, 9 deletions

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 9a636f961572..395b082d03a9 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -62,7 +62,7 @@ static int crypto_check_alg(struct crypto_alg *alg)
         if (alg->cra_priority < 0)
                 return -EINVAL;
 
-        atomic_set(&alg->cra_refcnt, 1);
+        refcount_set(&alg->cra_refcnt, 1);
 
         return crypto_set_driver_name(alg);
 }
@@ -123,7 +123,6 @@ static void crypto_remove_instance(struct crypto_instance *inst,
         if (!tmpl || !crypto_tmpl_get(tmpl))
                 return;
 
-        crypto_notify(CRYPTO_MSG_ALG_UNREGISTER, &inst->alg);
         list_move(&inst->alg.cra_list, list);
         hlist_del(&inst->list);
         inst->alg.cra_destroy = crypto_destroy_instance;
@@ -236,7 +235,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
         if (!larval->adult)
                 goto free_larval;
 
-        atomic_set(&larval->alg.cra_refcnt, 1);
+        refcount_set(&larval->alg.cra_refcnt, 1);
         memcpy(larval->alg.cra_driver_name, alg->cra_driver_name,
                CRYPTO_MAX_ALG_NAME);
         larval->alg.cra_priority = alg->cra_priority;
@@ -392,7 +391,6 @@ static int crypto_remove_alg(struct crypto_alg *alg, struct list_head *list)
 
         alg->cra_flags |= CRYPTO_ALG_DEAD;
 
-        crypto_notify(CRYPTO_MSG_ALG_UNREGISTER, alg);
         list_del_init(&alg->cra_list);
         crypto_remove_spawns(alg, list, NULL);
 
@@ -411,7 +409,7 @@ int crypto_unregister_alg(struct crypto_alg *alg)
         if (ret)
                 return ret;
 
-        BUG_ON(atomic_read(&alg->cra_refcnt) != 1);
+        BUG_ON(refcount_read(&alg->cra_refcnt) != 1);
         if (alg->cra_destroy)
                 alg->cra_destroy(alg);
 
@@ -470,7 +468,6 @@ int crypto_register_template(struct crypto_template *tmpl)
         }
 
         list_add(&tmpl->list, &crypto_template_list);
-        crypto_notify(CRYPTO_MSG_TMPL_REGISTER, tmpl);
         err = 0;
 out:
         up_write(&crypto_alg_sem);
@@ -497,12 +494,10 @@ void crypto_unregister_template(struct crypto_template *tmpl)
                 BUG_ON(err);
         }
 
-        crypto_notify(CRYPTO_MSG_TMPL_UNREGISTER, tmpl);
-
         up_write(&crypto_alg_sem);
 
         hlist_for_each_entry_safe(inst, n, list, list) {
-                BUG_ON(atomic_read(&inst->alg.cra_refcnt) != 1);
+                BUG_ON(refcount_read(&inst->alg.cra_refcnt) != 1);
                 crypto_free_instance(inst);
         }
         crypto_remove_final(&users);