Commit c5e07031 authored by Corentin Labbe's avatar Corentin Labbe Committed by Herbert Xu

crypto: ixp4xx - Correct functions alignment

This patch fixes all alignment issues reported by checkpatch.
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ffb017e9
...@@ -354,8 +354,8 @@ static void finish_scattered_hmac(struct crypt_ctl *crypt) ...@@ -354,8 +354,8 @@ static void finish_scattered_hmac(struct crypt_ctl *crypt)
int decryptlen = req->assoclen + req->cryptlen - authsize; int decryptlen = req->assoclen + req->cryptlen - authsize;
if (req_ctx->encrypt) { if (req_ctx->encrypt) {
scatterwalk_map_and_copy(req_ctx->hmac_virt, scatterwalk_map_and_copy(req_ctx->hmac_virt, req->dst,
req->dst, decryptlen, authsize, 1); decryptlen, authsize, 1);
} }
dma_pool_free(buffer_pool, req_ctx->hmac_virt, crypt->icv_rev_aes); dma_pool_free(buffer_pool, req_ctx->hmac_virt, crypt->icv_rev_aes);
} }
...@@ -412,7 +412,7 @@ static void one_packet(dma_addr_t phys) ...@@ -412,7 +412,7 @@ static void one_packet(dma_addr_t phys)
case CTL_FLAG_GEN_ICV: case CTL_FLAG_GEN_ICV:
ctx = crypto_tfm_ctx(crypt->data.tfm); ctx = crypto_tfm_ctx(crypt->data.tfm);
dma_pool_free(ctx_pool, crypt->regist_ptr, dma_pool_free(ctx_pool, crypt->regist_ptr,
crypt->regist_buf->phys_addr); crypt->regist_buf->phys_addr);
dma_pool_free(buffer_pool, crypt->regist_buf, crypt->src_buf); dma_pool_free(buffer_pool, crypt->regist_buf, crypt->src_buf);
if (atomic_dec_and_test(&ctx->configuring)) if (atomic_dec_and_test(&ctx->configuring))
complete(&ctx->completion); complete(&ctx->completion);
...@@ -494,14 +494,13 @@ static int init_ixp_crypto(struct device *dev) ...@@ -494,14 +494,13 @@ static int init_ixp_crypto(struct device *dev)
* so assure it is large enough * so assure it is large enough
*/ */
BUILD_BUG_ON(SHA1_DIGEST_SIZE > sizeof(struct buffer_desc)); BUILD_BUG_ON(SHA1_DIGEST_SIZE > sizeof(struct buffer_desc));
buffer_pool = dma_pool_create("buffer", dev, buffer_pool = dma_pool_create("buffer", dev, sizeof(struct buffer_desc),
sizeof(struct buffer_desc), 32, 0); 32, 0);
ret = -ENOMEM; ret = -ENOMEM;
if (!buffer_pool) if (!buffer_pool)
goto err; goto err;
ctx_pool = dma_pool_create("context", dev, ctx_pool = dma_pool_create("context", dev, NPE_CTX_LEN, 16, 0);
NPE_CTX_LEN, 16, 0);
if (!ctx_pool) if (!ctx_pool)
goto err; goto err;
...@@ -546,9 +545,8 @@ static void release_ixp_crypto(struct device *dev) ...@@ -546,9 +545,8 @@ static void release_ixp_crypto(struct device *dev)
npe_release(npe_c); npe_release(npe_c);
if (crypt_virt) if (crypt_virt)
dma_free_coherent(dev, dma_free_coherent(dev, NPE_QLEN * sizeof(struct crypt_ctl),
NPE_QLEN * sizeof(struct crypt_ctl), crypt_virt, crypt_phys);
crypt_virt, crypt_phys);
} }
static void reset_sa_dir(struct ix_sa_dir *dir) static void reset_sa_dir(struct ix_sa_dir *dir)
...@@ -641,7 +639,8 @@ static void exit_tfm_aead(struct crypto_aead *tfm) ...@@ -641,7 +639,8 @@ static void exit_tfm_aead(struct crypto_aead *tfm)
} }
static int register_chain_var(struct crypto_tfm *tfm, u8 xpad, u32 target, static int register_chain_var(struct crypto_tfm *tfm, u8 xpad, u32 target,
int init_len, u32 ctx_addr, const u8 *key, int key_len) int init_len, u32 ctx_addr, const u8 *key,
int key_len)
{ {
struct ixp_ctx *ctx = crypto_tfm_ctx(tfm); struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
struct crypt_ctl *crypt; struct crypt_ctl *crypt;
...@@ -735,11 +734,11 @@ static int setup_auth(struct crypto_tfm *tfm, int encrypt, unsigned int authsize ...@@ -735,11 +734,11 @@ static int setup_auth(struct crypto_tfm *tfm, int encrypt, unsigned int authsize
dir->npe_mode |= NPE_OP_HASH_VERIFY; dir->npe_mode |= NPE_OP_HASH_VERIFY;
ret = register_chain_var(tfm, HMAC_OPAD_VALUE, otarget, ret = register_chain_var(tfm, HMAC_OPAD_VALUE, otarget,
init_len, npe_ctx_addr, key, key_len); init_len, npe_ctx_addr, key, key_len);
if (ret) if (ret)
return ret; return ret;
return register_chain_var(tfm, HMAC_IPAD_VALUE, itarget, return register_chain_var(tfm, HMAC_IPAD_VALUE, itarget,
init_len, npe_ctx_addr, key, key_len); init_len, npe_ctx_addr, key, key_len);
} }
static int gen_rev_aes_key(struct crypto_tfm *tfm) static int gen_rev_aes_key(struct crypto_tfm *tfm)
...@@ -770,8 +769,8 @@ static int gen_rev_aes_key(struct crypto_tfm *tfm) ...@@ -770,8 +769,8 @@ static int gen_rev_aes_key(struct crypto_tfm *tfm)
return 0; return 0;
} }
static int setup_cipher(struct crypto_tfm *tfm, int encrypt, static int setup_cipher(struct crypto_tfm *tfm, int encrypt, const u8 *key,
const u8 *key, int key_len) int key_len)
{ {
u8 *cinfo; u8 *cinfo;
u32 cipher_cfg; u32 cipher_cfg;
...@@ -791,9 +790,15 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt, ...@@ -791,9 +790,15 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,
} }
if (cipher_cfg & MOD_AES) { if (cipher_cfg & MOD_AES) {
switch (key_len) { switch (key_len) {
case 16: keylen_cfg = MOD_AES128; break; case 16:
case 24: keylen_cfg = MOD_AES192; break; keylen_cfg = MOD_AES128;
case 32: keylen_cfg = MOD_AES256; break; break;
case 24:
keylen_cfg = MOD_AES192;
break;
case 32:
keylen_cfg = MOD_AES256;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -855,7 +860,7 @@ static struct buffer_desc *chainup_buffers(struct device *dev, ...@@ -855,7 +860,7 @@ static struct buffer_desc *chainup_buffers(struct device *dev,
} }
static int ablk_setkey(struct crypto_skcipher *tfm, const u8 *key, static int ablk_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int key_len) unsigned int key_len)
{ {
struct ixp_ctx *ctx = crypto_skcipher_ctx(tfm); struct ixp_ctx *ctx = crypto_skcipher_ctx(tfm);
int ret; int ret;
...@@ -892,7 +897,7 @@ static int ablk_des3_setkey(struct crypto_skcipher *tfm, const u8 *key, ...@@ -892,7 +897,7 @@ static int ablk_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,
} }
static int ablk_rfc3686_setkey(struct crypto_skcipher *tfm, const u8 *key, static int ablk_rfc3686_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int key_len) unsigned int key_len)
{ {
struct ixp_ctx *ctx = crypto_skcipher_ctx(tfm); struct ixp_ctx *ctx = crypto_skcipher_ctx(tfm);
...@@ -901,7 +906,7 @@ static int ablk_rfc3686_setkey(struct crypto_skcipher *tfm, const u8 *key, ...@@ -901,7 +906,7 @@ static int ablk_rfc3686_setkey(struct crypto_skcipher *tfm, const u8 *key,
return -EINVAL; return -EINVAL;
memcpy(ctx->nonce, key + (key_len - CTR_RFC3686_NONCE_SIZE), memcpy(ctx->nonce, key + (key_len - CTR_RFC3686_NONCE_SIZE),
CTR_RFC3686_NONCE_SIZE); CTR_RFC3686_NONCE_SIZE);
key_len -= CTR_RFC3686_NONCE_SIZE; key_len -= CTR_RFC3686_NONCE_SIZE;
return ablk_setkey(tfm, key, key_len); return ablk_setkey(tfm, key, key_len);
...@@ -979,7 +984,7 @@ static int ablk_perform(struct skcipher_request *req, int encrypt) ...@@ -979,7 +984,7 @@ static int ablk_perform(struct skcipher_request *req, int encrypt)
* for more than one dst buffer, I think. */ * for more than one dst buffer, I think. */
req_ctx->dst = NULL; req_ctx->dst = NULL;
if (!chainup_buffers(dev, req->dst, nbytes, &dst_hook, if (!chainup_buffers(dev, req->dst, nbytes, &dst_hook,
flags, DMA_FROM_DEVICE)) flags, DMA_FROM_DEVICE))
goto free_buf_dest; goto free_buf_dest;
src_direction = DMA_TO_DEVICE; src_direction = DMA_TO_DEVICE;
req_ctx->dst = dst_hook.next; req_ctx->dst = dst_hook.next;
...@@ -988,8 +993,8 @@ static int ablk_perform(struct skcipher_request *req, int encrypt) ...@@ -988,8 +993,8 @@ static int ablk_perform(struct skcipher_request *req, int encrypt)
req_ctx->dst = NULL; req_ctx->dst = NULL;
} }
req_ctx->src = NULL; req_ctx->src = NULL;
if (!chainup_buffers(dev, req->src, nbytes, &src_hook, if (!chainup_buffers(dev, req->src, nbytes, &src_hook, flags,
flags, src_direction)) src_direction))
goto free_buf_src; goto free_buf_src;
req_ctx->src = src_hook.next; req_ctx->src = src_hook.next;
...@@ -1042,7 +1047,7 @@ static int ablk_rfc3686_crypt(struct skcipher_request *req) ...@@ -1042,7 +1047,7 @@ static int ablk_rfc3686_crypt(struct skcipher_request *req)
} }
static int aead_perform(struct aead_request *req, int encrypt, static int aead_perform(struct aead_request *req, int encrypt,
int cryptoffset, int eff_cryptlen, u8 *iv) int cryptoffset, int eff_cryptlen, u8 *iv)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct ixp_ctx *ctx = crypto_aead_ctx(tfm); struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1130,12 +1135,12 @@ static int aead_perform(struct aead_request *req, int encrypt, ...@@ -1130,12 +1135,12 @@ static int aead_perform(struct aead_request *req, int encrypt,
/* The 12 hmac bytes are scattered, /* The 12 hmac bytes are scattered,
* we need to copy them into a safe buffer */ * we need to copy them into a safe buffer */
req_ctx->hmac_virt = dma_pool_alloc(buffer_pool, flags, req_ctx->hmac_virt = dma_pool_alloc(buffer_pool, flags,
&crypt->icv_rev_aes); &crypt->icv_rev_aes);
if (unlikely(!req_ctx->hmac_virt)) if (unlikely(!req_ctx->hmac_virt))
goto free_buf_dst; goto free_buf_dst;
if (!encrypt) { if (!encrypt) {
scatterwalk_map_and_copy(req_ctx->hmac_virt, scatterwalk_map_and_copy(req_ctx->hmac_virt,
req->src, cryptlen, authsize, 0); req->src, cryptlen, authsize, 0);
} }
req_ctx->encrypt = encrypt; req_ctx->encrypt = encrypt;
} else { } else {
...@@ -1176,11 +1181,11 @@ static int aead_setup(struct crypto_aead *tfm, unsigned int authsize) ...@@ -1176,11 +1181,11 @@ static int aead_setup(struct crypto_aead *tfm, unsigned int authsize)
if (ret) if (ret)
goto out; goto out;
ret = setup_auth(&tfm->base, 0, authsize, ctx->authkey, ret = setup_auth(&tfm->base, 0, authsize, ctx->authkey,
ctx->authkey_len, digest_len); ctx->authkey_len, digest_len);
if (ret) if (ret)
goto out; goto out;
ret = setup_auth(&tfm->base, 1, authsize, ctx->authkey, ret = setup_auth(&tfm->base, 1, authsize, ctx->authkey,
ctx->authkey_len, digest_len); ctx->authkey_len, digest_len);
out: out:
if (!atomic_dec_and_test(&ctx->configuring)) if (!atomic_dec_and_test(&ctx->configuring))
wait_for_completion(&ctx->completion); wait_for_completion(&ctx->completion);
...@@ -1197,7 +1202,7 @@ static int aead_setauthsize(struct crypto_aead *tfm, unsigned int authsize) ...@@ -1197,7 +1202,7 @@ static int aead_setauthsize(struct crypto_aead *tfm, unsigned int authsize)
} }
static int aead_setkey(struct crypto_aead *tfm, const u8 *key, static int aead_setkey(struct crypto_aead *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct ixp_ctx *ctx = crypto_aead_ctx(tfm); struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
struct crypto_authenc_keys keys; struct crypto_authenc_keys keys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment