Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 - The crypto API is now documented :)
 - Disallow arbitrary module loading through crypto API.
 - Allow get request with empty driver name through crypto_user.
 - Allow speed testing of arbitrary hash functions.
 - Add caam support for ctr(aes), gcm(aes) and their derivatives.
 - nx now supports concurrent hashing properly.
 - Add sahara support for SHA1/256.
 - Add ARM64 version of CRC32.
 - Misc fixes.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (77 commits)
  crypto: tcrypt - Allow speed testing of arbitrary hash functions
  crypto: af_alg - add user space interface for AEAD
  crypto: qat - fix problem with coalescing enable logic
  crypto: sahara - add support for SHA1/256
  crypto: sahara - replace tasklets with kthread
  crypto: sahara - add support for i.MX53
  crypto: sahara - fix spinlock initialization
  crypto: arm - replace memset by memzero_explicit
  crypto: powerpc - replace memset by memzero_explicit
  crypto: sha - replace memset by memzero_explicit
  crypto: sparc - replace memset by memzero_explicit
  crypto: algif_skcipher - initialize upon init request
  crypto: algif_skcipher - removed unneeded code
  crypto: algif_skcipher - Fixed blocking recvmsg
  crypto: drbg - use memzero_explicit() for clearing sensitive data
  crypto: drbg - use MODULE_ALIAS_CRYPTO
  crypto: include crypto- module prefix in template
  crypto: user - add MODULE_ALIAS
  crypto: sha-mb - remove a bogus NULL check
  crytpo: qat - Fix 64 bytes requests
  ...

10 files changed, 52 insertions, 39 deletions

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h
index fe7b3f06f6e6..2ed425664a16 100644
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -56,8 +56,6 @@
 #define PCI_VENDOR_ID_INTEL 0x8086
 #define ADF_DH895XCC_DEVICE_NAME "dh895xcc"
 #define ADF_DH895XCC_PCI_DEVICE_ID 0x435
-#define ADF_DH895XCC_PMISC_BAR 1
-#define ADF_DH895XCC_ETR_BAR 2
 #define ADF_PCI_MAX_BARS 3
 #define ADF_DEVICE_NAME_LENGTH 32
 #define ADF_ETR_MAX_RINGS_PER_BANK 16
diff --git a/drivers/crypto/qat/qat_common/adf_aer.c b/drivers/crypto/qat/qat_common/adf_aer.c
index c29d4c3926bf..10ce4a2854ab 100644
--- a/drivers/crypto/qat/qat_common/adf_aer.c
+++ b/drivers/crypto/qat/qat_common/adf_aer.c
@@ -90,7 +90,7 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev)
         uint16_t ppdstat = 0, bridge_ctl = 0;
         int pending = 0;
 
-        pr_info("QAT: Reseting device qat_dev%d\n", accel_dev->accel_id);
+        pr_info("QAT: Resetting device qat_dev%d\n", accel_dev->accel_id);
         pci_read_config_word(pdev, PPDSTAT_OFFSET, &ppdstat);
         pending = ppdstat & PCI_EXP_DEVSTA_TRPND;
         if (pending) {
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index 244d73378f0e..7ee93f881db6 100644
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -52,6 +52,7 @@
 #include <linux/pci.h>
 #include <linux/cdev.h>
 #include <linux/uaccess.h>
+#include <linux/crypto.h>
 
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
@@ -487,4 +488,4 @@ module_exit(adf_unregister_ctl_device_driver);
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Intel");
 MODULE_DESCRIPTION("Intel(R) QuickAssist Technology");
-MODULE_ALIAS("intel_qat");
+MODULE_ALIAS_CRYPTO("intel_qat");
diff --git a/drivers/crypto/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/qat/qat_common/adf_dev_mgr.c
index ae71555c0868..4a0a829d4500 100644
--- a/drivers/crypto/qat/qat_common/adf_dev_mgr.c
+++ b/drivers/crypto/qat/qat_common/adf_dev_mgr.c
@@ -129,12 +129,13 @@ struct adf_accel_dev *adf_devmgr_get_first(void)
  * Function returns acceleration device associated with the given pci device.
  * To be used by QAT device specific drivers.
  *
- * Return: pinter to accel_dev or NULL if not found.
+ * Return: pointer to accel_dev or NULL if not found.
  */
 struct adf_accel_dev *adf_devmgr_pci_to_accel_dev(struct pci_dev *pci_dev)
 {
         struct list_head *itr;
 
+        mutex_lock(&table_lock);
         list_for_each(itr, &accel_table) {
                 struct adf_accel_dev *ptr =
                                 list_entry(itr, struct adf_accel_dev, list);
@@ -144,6 +145,7 @@ struct adf_accel_dev *adf_devmgr_pci_to_accel_dev(struct pci_dev *pci_dev)
                         return ptr;
                 }
         }
+        mutex_unlock(&table_lock);
         return NULL;
 }
 EXPORT_SYMBOL_GPL(adf_devmgr_pci_to_accel_dev);
@@ -152,6 +154,7 @@ struct adf_accel_dev *adf_devmgr_get_dev_by_id(uint32_t id)
 {
         struct list_head *itr;
 
+        mutex_lock(&table_lock);
         list_for_each(itr, &accel_table) {
                 struct adf_accel_dev *ptr =
                                 list_entry(itr, struct adf_accel_dev, list);
@@ -161,6 +164,7 @@ struct adf_accel_dev *adf_devmgr_get_dev_by_id(uint32_t id)
                         return ptr;
                 }
         }
+        mutex_unlock(&table_lock);
         return NULL;
 }
 
diff --git a/drivers/crypto/qat/qat_common/adf_transport.c b/drivers/crypto/qat/qat_common/adf_transport.c
index 9dd2cb72a4e8..7dd54aaee9fa 100644
--- a/drivers/crypto/qat/qat_common/adf_transport.c
+++ b/drivers/crypto/qat/qat_common/adf_transport.c
@@ -376,8 +376,9 @@ static inline int adf_get_cfg_int(struct adf_accel_dev *accel_dev,
         return 0;
 }
 
-static void adf_enable_coalesc(struct adf_etr_bank_data *bank,
-                               const char *section, uint32_t bank_num_in_accel)
+static void adf_get_coalesc_timer(struct adf_etr_bank_data *bank,
+                                  const char *section,
+                                  uint32_t bank_num_in_accel)
 {
         if (adf_get_cfg_int(bank->accel_dev, section,
                             ADF_ETRMGR_COALESCE_TIMER_FORMAT,
@@ -396,7 +397,7 @@ static int adf_init_bank(struct adf_accel_dev *accel_dev,
         struct adf_hw_device_data *hw_data = accel_dev->hw_device;
         struct adf_etr_ring_data *ring;
         struct adf_etr_ring_data *tx_ring;
-        uint32_t i, coalesc_enabled;
+        uint32_t i, coalesc_enabled = 0;
 
         memset(bank, 0, sizeof(*bank));
         bank->bank_number = bank_num;
@@ -407,10 +408,10 @@ static int adf_init_bank(struct adf_accel_dev *accel_dev,
         /* Enable IRQ coalescing always. This will allow to use
          * the optimised flag and coalesc register.
          * If it is disabled in the config file just use min time value */
-        if (adf_get_cfg_int(accel_dev, "Accelerator0",
-                            ADF_ETRMGR_COALESCING_ENABLED_FORMAT,
-                            bank_num, &coalesc_enabled) && coalesc_enabled)
-                adf_enable_coalesc(bank, "Accelerator0", bank_num);
+        if ((adf_get_cfg_int(accel_dev, "Accelerator0",
+                             ADF_ETRMGR_COALESCING_ENABLED_FORMAT, bank_num,
+                             &coalesc_enabled) == 0) && coalesc_enabled)
+                adf_get_coalesc_timer(bank, "Accelerator0", bank_num);
         else
                 bank->irq_coalesc_timer = ADF_COALESCING_MIN_TIME;
 
diff --git a/drivers/crypto/qat/qat_common/adf_transport_access_macros.h b/drivers/crypto/qat/qat_common/adf_transport_access_macros.h
index 91d88d676580..160c9a36c919 100644
--- a/drivers/crypto/qat/qat_common/adf_transport_access_macros.h
+++ b/drivers/crypto/qat/qat_common/adf_transport_access_macros.h
@@ -83,14 +83,14 @@
 #define ADF_MAX_RING_SIZE ADF_RING_SIZE_4M
 #define ADF_DEFAULT_RING_SIZE ADF_RING_SIZE_16K
 
-/* Valid internal msg size values internal */
+/* Valid internal msg size values */
 #define ADF_MSG_SIZE_32 0x01
 #define ADF_MSG_SIZE_64 0x02
 #define ADF_MSG_SIZE_128 0x04
 #define ADF_MIN_MSG_SIZE ADF_MSG_SIZE_32
 #define ADF_MAX_MSG_SIZE ADF_MSG_SIZE_128
 
-/* Size to bytes conversion macros for ring and msg values */
+/* Size to bytes conversion macros for ring and msg size values */
 #define ADF_MSG_SIZE_TO_BYTES(SIZE) (SIZE << 5)
 #define ADF_BYTES_TO_MSG_SIZE(SIZE) (SIZE >> 5)
 #define ADF_SIZE_TO_RING_SIZE_IN_BYTES(SIZE) ((1 << (SIZE - 1)) << 7)
@@ -100,8 +100,11 @@
 #define ADF_RING_SIZE_BYTES_MIN(SIZE) ((SIZE < ADF_RING_SIZE_4K) ? \
                                 ADF_RING_SIZE_4K : SIZE)
 #define ADF_RING_SIZE_MODULO(SIZE) (SIZE + 0x6)
+#define ADF_SIZE_TO_POW(SIZE) ((((SIZE & 0x4) >> 1) | ((SIZE & 0x4) >> 2) | \
+                                SIZE) & ~0x4)
+/* Max outstanding requests */
 #define ADF_MAX_INFLIGHTS(RING_SIZE, MSG_SIZE) \
-        ((((1 << (RING_SIZE - 1)) << 4) >> MSG_SIZE) - 1)
+        ((((1 << (RING_SIZE - 1)) << 3) >> ADF_SIZE_TO_POW(MSG_SIZE)) - 1)
 #define BUILD_RING_CONFIG(size) \
         ((ADF_RING_NEAR_WATERMARK_0 << ADF_RING_CONFIG_NEAR_FULL_WM) \
         | (ADF_RING_NEAR_WATERMARK_0 << ADF_RING_CONFIG_NEAR_EMPTY_WM) \
diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
index 9e9619cd4a79..19eea1c832ac 100644
--- a/drivers/crypto/qat/qat_common/qat_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
@@ -161,7 +161,7 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash,
         __be64 *hash512_state_out;
         int i, offset;
 
-        memset(auth_state.data, '\0', MAX_AUTH_STATE_SIZE + 64);
+        memzero_explicit(auth_state.data, MAX_AUTH_STATE_SIZE + 64);
         shash->tfm = ctx->hash_tfm;
         shash->flags = 0x0;
 
@@ -174,13 +174,13 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash,
 
                 memcpy(ipad, buff, digest_size);
                 memcpy(opad, buff, digest_size);
-                memset(ipad + digest_size, 0, block_size - digest_size);
-                memset(opad + digest_size, 0, block_size - digest_size);
+                memzero_explicit(ipad + digest_size, block_size - digest_size);
+                memzero_explicit(opad + digest_size, block_size - digest_size);
         } else {
                 memcpy(ipad, auth_key, auth_keylen);
                 memcpy(opad, auth_key, auth_keylen);
-                memset(ipad + auth_keylen, 0, block_size - auth_keylen);
-                memset(opad + auth_keylen, 0, block_size - auth_keylen);
+                memzero_explicit(ipad + auth_keylen, block_size - auth_keylen);
+                memzero_explicit(opad + auth_keylen, block_size - auth_keylen);
         }
 
         for (i = 0; i < block_size; i++) {
@@ -254,6 +254,8 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash,
         default:
                 return -EFAULT;
         }
+        memzero_explicit(ipad, block_size);
+        memzero_explicit(opad, block_size);
         return 0;
 }
 
@@ -466,7 +468,6 @@ static int qat_alg_init_sessions(struct qat_alg_session_ctx *ctx,
                 break;
         default:
                 goto bad_key;
-                break;
         }
 
         if (qat_alg_init_enc_session(ctx, alg, &keys))
@@ -493,12 +494,12 @@ static int qat_alg_setkey(struct crypto_aead *tfm, const uint8_t *key,
         if (ctx->enc_cd) {
                 /* rekeying */
                 dev = &GET_DEV(ctx->inst->accel_dev);
-                memset(ctx->enc_cd, 0, sizeof(struct qat_alg_cd));
-                memset(ctx->dec_cd, 0, sizeof(struct qat_alg_cd));
-                memset(&ctx->enc_fw_req_tmpl, 0,
-                       sizeof(struct icp_qat_fw_la_bulk_req));
-                memset(&ctx->dec_fw_req_tmpl, 0,
-                       sizeof(struct icp_qat_fw_la_bulk_req));
+                memzero_explicit(ctx->enc_cd, sizeof(struct qat_alg_cd));
+                memzero_explicit(ctx->dec_cd, sizeof(struct qat_alg_cd));
+                memzero_explicit(&ctx->enc_fw_req_tmpl,
+                                 sizeof(struct icp_qat_fw_la_bulk_req));
+                memzero_explicit(&ctx->dec_fw_req_tmpl,
+                                 sizeof(struct icp_qat_fw_la_bulk_req));
         } else {
                 /* new key */
                 int node = get_current_node();
@@ -535,10 +536,12 @@ static int qat_alg_setkey(struct crypto_aead *tfm, const uint8_t *key,
         return 0;
 
 out_free_all:
+        memzero_explicit(ctx->dec_cd, sizeof(struct qat_alg_cd));
         dma_free_coherent(dev, sizeof(struct qat_alg_cd),
                           ctx->dec_cd, ctx->dec_cd_paddr);
         ctx->dec_cd = NULL;
 out_free_enc:
+        memzero_explicit(ctx->enc_cd, sizeof(struct qat_alg_cd));
         dma_free_coherent(dev, sizeof(struct qat_alg_cd),
                           ctx->enc_cd, ctx->enc_cd_paddr);
         ctx->enc_cd = NULL;
@@ -836,7 +839,7 @@ static int qat_alg_init(struct crypto_tfm *tfm,
 {
         struct qat_alg_session_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        memset(ctx, '\0', sizeof(*ctx));
+        memzero_explicit(ctx, sizeof(*ctx));
         ctx->hash_tfm = crypto_alloc_shash(hash_name, 0, 0);
         if (IS_ERR(ctx->hash_tfm))
                 return -EFAULT;
@@ -876,12 +879,16 @@ static void qat_alg_exit(struct crypto_tfm *tfm)
                 return;
 
         dev = &GET_DEV(inst->accel_dev);
-        if (ctx->enc_cd)
+        if (ctx->enc_cd) {
+                memzero_explicit(ctx->enc_cd, sizeof(struct qat_alg_cd));
                 dma_free_coherent(dev, sizeof(struct qat_alg_cd),
                                   ctx->enc_cd, ctx->enc_cd_paddr);
-        if (ctx->dec_cd)
+        }
+        if (ctx->dec_cd) {
+                memzero_explicit(ctx->dec_cd, sizeof(struct qat_alg_cd));
                 dma_free_coherent(dev, sizeof(struct qat_alg_cd),
                                   ctx->dec_cd, ctx->dec_cd_paddr);
+        }
         qat_crypto_put_instance(inst);
 }
 
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index 9b8a31521ff3..b818c19713bf 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -679,7 +679,8 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
         struct icp_qat_fw_loader_handle *handle;
         struct adf_accel_pci *pci_info = &accel_dev->accel_pci_dev;
         struct adf_hw_device_data *hw_data = accel_dev->hw_device;
-        struct adf_bar *bar = &pci_info->pci_bars[ADF_DH895XCC_PMISC_BAR];
+        struct adf_bar *bar =
+                        &pci_info->pci_bars[hw_data->get_misc_bar_id(hw_data)];
 
         handle = kzalloc(sizeof(*handle), GFP_KERNEL);
         if (!handle)
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
index 65dd1ff93d3b..01e0be21e93a 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
@@ -48,6 +48,8 @@
 #define ADF_DH895x_HW_DATA_H_
 
 /* PCIe configuration space */
+#define ADF_DH895XCC_PMISC_BAR 1
+#define ADF_DH895XCC_ETR_BAR 2
 #define ADF_DH895XCC_RX_RINGS_OFFSET 8
 #define ADF_DH895XCC_TX_RINGS_MASK 0xFF
 #define ADF_DH895XCC_FUSECTL_OFFSET 0x40
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_isr.c b/drivers/crypto/qat/qat_dh895xcc/adf_isr.c
index d96ee21b9b77..fe8f89697ad8 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_isr.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_isr.c
@@ -186,10 +186,8 @@ static int adf_isr_alloc_msix_entry_table(struct adf_accel_dev *accel_dev)
         accel_dev->accel_pci_dev.msix_entries.names = names;
         return 0;
 err:
-        for (i = 0; i < msix_num_entries; i++) {
-                if (*(names + i))
-                        kfree(*(names + i));
-        }
+        for (i = 0; i < msix_num_entries; i++)
+                kfree(*(names + i));
         kfree(entries);
         kfree(names);
         return -ENOMEM;
@@ -203,10 +201,8 @@ static void adf_isr_free_msix_entry_table(struct adf_accel_dev *accel_dev)
         int i;
 
         kfree(accel_dev->accel_pci_dev.msix_entries.entries);
-        for (i = 0; i < msix_num_entries; i++) {
-                if (*(names + i))
-                        kfree(*(names + i));
-        }
+        for (i = 0; i < msix_num_entries; i++)
+                kfree(*(names + i));
         kfree(names);
 }