leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: caam - move append_key_aead() into init_sh_desc_key_aead()

Browse Source 
append_key_aead() is used in only one place, thus inline it.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Horia Geantă 2016-11-22 15:44:03 +02:00 committed by Herbert Xu
parent 211f41af53
commit 64c9295b23
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/crypto/caam/caamalg.c
View File

@ -228,12 +228,19 @@ struct caam_ctx {
unsigned int authsize; unsigned int authsize;
}; };
static void append_key_aead(u32 *desc, struct caam_ctx *ctx, static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx,
int keys_fit_inline, bool is_rfc3686) int keys_fit_inline, bool is_rfc3686)
{ {
u32 *nonce; u32 *key_jump_cmd;
unsigned int enckeylen = ctx->enckeylen; unsigned int enckeylen = ctx->enckeylen;
/* Note: Context registers are saved. */
init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);
/* Skip if already shared */
key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |
JUMP_COND_SHRD);
/* /*
* RFC3686 specific: * RFC3686 specific:
* | ctx->key = {AUTH_KEY, ENC_KEY, NONCE} * | ctx->key = {AUTH_KEY, ENC_KEY, NONCE}
@ -258,6 +265,8 @@ static void append_key_aead(u32 *desc, struct caam_ctx *ctx,
/* Load Counter into CONTEXT1 reg */ /* Load Counter into CONTEXT1 reg */
if (is_rfc3686) { if (is_rfc3686) {
u32 *nonce;
nonce = (u32 *)((void *)ctx->key + ctx->split_key_pad_len + nonce = (u32 *)((void *)ctx->key + ctx->split_key_pad_len +
enckeylen); enckeylen);
append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE, append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,
@ -269,21 +278,6 @@ static void append_key_aead(u32 *desc, struct caam_ctx *ctx,
(16 << MOVE_OFFSET_SHIFT) | (16 << MOVE_OFFSET_SHIFT) |
(CTR_RFC3686_NONCE_SIZE << MOVE_LEN_SHIFT)); (CTR_RFC3686_NONCE_SIZE << MOVE_LEN_SHIFT));
} }
}
static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx,
int keys_fit_inline, bool is_rfc3686)
{
u32 *key_jump_cmd;
/* Note: Context registers are saved. */
init_sh_desc(desc, HDR_SHARE_SERIAL | HDR_SAVECTX);
/* Skip if already shared */
key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL |
JUMP_COND_SHRD);
append_key_aead(desc, ctx, keys_fit_inline, is_rfc3686);
set_jump_tgt_here(desc, key_jump_cmd); set_jump_tgt_here(desc, key_jump_cmd);
} }