Descriptors rewritten using RTA were tested to be bit-exact (i.e. exact hex dump) with the ones being replaced, with the following exceptions: -shared descriptors - start index is 1 instead of 0; this has no functional effect -MDHA split keys are different - since the keys are the pre-computed IPAD | OPAD HMAC keys encrypted with JDKEK (Job Descriptor Key-Encryption Key); JDKEK changes at device POR. Signed-off-by: Horia Geanta <horia.geanta@xxxxxxxxxxxxx> --- drivers/crypto/caam/caamalg.c | 668 +++++++++++++++++++++-------------------- drivers/crypto/caam/caamhash.c | 389 ++++++++++++++---------- drivers/crypto/caam/caamrng.c | 41 ++- drivers/crypto/caam/ctrl.c | 83 +++-- drivers/crypto/caam/ctrl.h | 2 +- drivers/crypto/caam/key_gen.c | 35 +-- drivers/crypto/caam/key_gen.h | 5 +- 7 files changed, 680 insertions(+), 543 deletions(-) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index c3a845856cd0..cd1ba573c633 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -48,7 +48,8 @@ #include "regs.h" #include "intern.h" -#include "desc_constr.h" +#include "flib/rta.h" +#include "flib/desc/common.h" #include "jr.h" #include "error.h" #include "sg_sw_sec4.h" @@ -91,61 +92,57 @@ #define debug(format, arg...) #endif static struct list_head alg_list; +static const bool ps = (sizeof(dma_addr_t) == sizeof(u64)); /* Set DK bit in class 1 operation if shared */ -static inline void append_dec_op1(u32 *desc, u32 type) +static inline void append_dec_op1(struct program *p, u32 type) { - u32 *jump_cmd, *uncond_jump_cmd; + LABEL(jump_cmd); + REFERENCE(pjump_cmd); + LABEL(uncond_jump_cmd); + REFERENCE(puncond_jump_cmd); /* DK bit is valid only for AES */ if ((type & OP_ALG_ALGSEL_MASK) != OP_ALG_ALGSEL_AES) { - append_operation(desc, type | OP_ALG_AS_INITFINAL | - OP_ALG_DECRYPT); + ALG_OPERATION(p, type & OP_ALG_ALGSEL_MASK, + type & OP_ALG_AAI_MASK, OP_ALG_AS_INITFINAL, + ICV_CHECK_DISABLE, DIR_DEC); return; } - jump_cmd = append_jump(desc, JUMP_TEST_ALL | JUMP_COND_SHRD); - append_operation(desc, type | OP_ALG_AS_INITFINAL | - OP_ALG_DECRYPT); - uncond_jump_cmd = append_jump(desc, JUMP_TEST_ALL); - set_jump_tgt_here(desc, jump_cmd); - append_operation(desc, type | OP_ALG_AS_INITFINAL | - OP_ALG_DECRYPT | OP_ALG_AAI_DK); - set_jump_tgt_here(desc, uncond_jump_cmd); -} - -/* - * For aead functions, read payload and write payload, - * both of which are specified in req->src and req->dst - */ -static inline void aead_append_src_dst(u32 *desc, u32 msg_type) -{ - append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF); - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH | - KEY_VLF | msg_type | FIFOLD_TYPE_LASTBOTH); + pjump_cmd = JUMP(p, jump_cmd, LOCAL_JUMP, ALL_TRUE, SHRD); + ALG_OPERATION(p, type & OP_ALG_ALGSEL_MASK, type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_DEC); + puncond_jump_cmd = JUMP(p, uncond_jump_cmd, LOCAL_JUMP, ALL_TRUE, 0); + SET_LABEL(p, jump_cmd); + ALG_OPERATION(p, type & OP_ALG_ALGSEL_MASK, + (type & OP_ALG_AAI_MASK) | OP_ALG_AAI_DK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_DEC); + SET_LABEL(p, uncond_jump_cmd); + + PATCH_JUMP(p, pjump_cmd, jump_cmd); + PATCH_JUMP(p, puncond_jump_cmd, uncond_jump_cmd); } /* * For aead encrypt and decrypt, read iv for both classes */ -static inline void aead_append_ld_iv(u32 *desc, int ivsize) +static inline void aead_append_ld_iv(struct program *p, u32 ivsize) { - append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_1_CCB | ivsize); - append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO | ivsize); + SEQLOAD(p, CONTEXT1, 0, ivsize, 0); + MOVE(p, CONTEXT1, 0, IFIFOAB2, 0, ivsize, IMMED); } /* * For ablkcipher encrypt and decrypt, read from req->src and * write to req->dst */ -static inline void ablkcipher_append_src_dst(u32 *desc) +static inline void ablkcipher_append_src_dst(struct program *p) { - append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ); - append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ); - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS1 | - KEY_VLF | FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST1); - append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF); + MATHB(p, SEQINSZ, ADD, MATH0, VSEQOUTSZ, 4, 0); + MATHB(p, SEQINSZ, ADD, MATH0, VSEQINSZ, 4, 0); + SEQFIFOLOAD(p, MSG1, 0, VLF | LAST1); + SEQFIFOSTORE(p, MSG, 0, 0, VLF); } /* @@ -168,7 +165,6 @@ struct caam_ctx { dma_addr_t sh_desc_givenc_dma; u32 class1_alg_type; u32 class2_alg_type; - u32 alg_op; u8 key[CAAM_MAX_KEY_SIZE]; dma_addr_t key_dma; unsigned int enckeylen; @@ -177,38 +173,37 @@ struct caam_ctx { unsigned int authsize; }; -static void append_key_aead(u32 *desc, struct caam_ctx *ctx, +static void append_key_aead(struct program *p, struct caam_ctx *ctx, int keys_fit_inline) { if (keys_fit_inline) { - append_key_as_imm(desc, ctx->key, ctx->split_key_pad_len, - ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); - append_key_as_imm(desc, (void *)ctx->key + - ctx->split_key_pad_len, ctx->enckeylen, - ctx->enckeylen, CLASS_1 | KEY_DEST_CLASS_REG); + KEY(p, MDHA_SPLIT_KEY, ENC, (uintptr_t)ctx->key, + ctx->split_key_len, IMMED | COPY); + KEY(p, KEY1, 0, (uintptr_t)(ctx->key + ctx->split_key_pad_len), + ctx->enckeylen, IMMED | COPY); } else { - append_key(desc, ctx->key_dma, ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); - append_key(desc, ctx->key_dma + ctx->split_key_pad_len, - ctx->enckeylen, CLASS_1 | KEY_DEST_CLASS_REG); + KEY(p, MDHA_SPLIT_KEY, ENC, ctx->key_dma, ctx->split_key_len, + 0); + KEY(p, KEY1, 0, ctx->key_dma + ctx->split_key_pad_len, + ctx->enckeylen, 0); } } -static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx, +static void init_sh_desc_key_aead(struct program *p, struct caam_ctx *ctx, int keys_fit_inline) { - u32 *key_jump_cmd; + LABEL(key_jump_cmd); + REFERENCE(pkey_jump_cmd); - init_sh_desc(desc, HDR_SHARE_SERIAL); + SHR_HDR(p, SHR_SERIAL, 1, 0); /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); + pkey_jump_cmd = JUMP(p, key_jump_cmd, LOCAL_JUMP, ALL_TRUE, SHRD); - append_key_aead(desc, ctx, keys_fit_inline); + append_key_aead(p, ctx, keys_fit_inline); - set_jump_tgt_here(desc, key_jump_cmd); + SET_LABEL(p, key_jump_cmd); + PATCH_JUMP(p, pkey_jump_cmd, key_jump_cmd); } static int aead_null_set_sh_desc(struct crypto_aead *aead) @@ -217,8 +212,18 @@ static int aead_null_set_sh_desc(struct crypto_aead *aead) struct caam_ctx *ctx = crypto_aead_ctx(aead); struct device *jrdev = ctx->jrdev; bool keys_fit_inline = false; - u32 *key_jump_cmd, *jump_cmd, *read_move_cmd, *write_move_cmd; u32 *desc; + struct program prg; + struct program *p = &prg; + unsigned desc_bytes; + LABEL(skip_key_load); + REFERENCE(pskip_key_load); + LABEL(nop_cmd); + REFERENCE(pnop_cmd); + LABEL(read_move_cmd); + REFERENCE(pread_move_cmd); + LABEL(write_move_cmd); + REFERENCE(pwrite_move_cmd); /* * Job Descriptor and Shared Descriptors @@ -230,70 +235,71 @@ static int aead_null_set_sh_desc(struct crypto_aead *aead) /* aead_encrypt shared descriptor */ desc = ctx->sh_desc_enc; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - init_sh_desc(desc, HDR_SHARE_SERIAL); + SHR_HDR(p, SHR_SERIAL, 1, 0); /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); + pskip_key_load = JUMP(p, skip_key_load, LOCAL_JUMP, ALL_TRUE, SHRD); if (keys_fit_inline) - append_key_as_imm(desc, ctx->key, ctx->split_key_pad_len, - ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); + KEY(p, MDHA_SPLIT_KEY, ENC, (uintptr_t)ctx->key, + ctx->split_key_len, IMMED | COPY); else - append_key(desc, ctx->key_dma, ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); - set_jump_tgt_here(desc, key_jump_cmd); + KEY(p, MDHA_SPLIT_KEY, ENC, ctx->key_dma, ctx->split_key_len, + 0); + SET_LABEL(p, skip_key_load); /* cryptlen = seqoutlen - authsize */ - append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize); + MATHB(p, SEQOUTSZ, SUB, ctx->authsize, MATH3, CAAM_CMD_SZ, IMMED2); /* * NULL encryption; IV is zero * assoclen = (assoclen + cryptlen) - cryptlen */ - append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG3, CAAM_CMD_SZ); + MATHB(p, SEQINSZ, SUB, MATH3, VSEQINSZ, CAAM_CMD_SZ, 0); /* read assoc before reading payload */ - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | - KEY_VLF); + SEQFIFOLOAD(p, MSG2, 0 , VLF); /* Prepare to read and write cryptlen bytes */ - append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ); - append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); + MATHB(p, ZERO, ADD, MATH3, VSEQINSZ, CAAM_CMD_SZ, 0); + MATHB(p, ZERO, ADD, MATH3, VSEQOUTSZ, CAAM_CMD_SZ, 0); /* * MOVE_LEN opcode is not available in all SEC HW revisions, * thus need to do some magic, i.e. self-patch the descriptor * buffer. */ - read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | - MOVE_DEST_MATH3 | - (0x6 << MOVE_LEN_SHIFT)); - write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | - MOVE_DEST_DESCBUF | - MOVE_WAITCOMP | - (0x8 << MOVE_LEN_SHIFT)); + pread_move_cmd = MOVE(p, DESCBUF, 0, MATH3, 0, 6, IMMED); + pwrite_move_cmd = MOVE(p, MATH3, 0, DESCBUF, 0, 8, WAITCOMP | IMMED); /* Class 2 operation */ - append_operation(desc, ctx->class2_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->class2_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class2_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_ENC); /* Read and write cryptlen bytes */ - aead_append_src_dst(desc, FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1); + SEQFIFOSTORE(p, MSG, 0, 0, VLF); + SEQFIFOLOAD(p, MSGINSNOOP, 0, VLF | LAST1 | LAST2 | FLUSH1); - set_move_tgt_here(desc, read_move_cmd); - set_move_tgt_here(desc, write_move_cmd); - append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO); - append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO | - MOVE_AUX_LS); + SET_LABEL(p, read_move_cmd); + SET_LABEL(p, write_move_cmd); + LOAD(p, 0, DCTRL, LDOFF_DISABLE_AUTO_NFIFO, 0, IMMED); + MOVE(p, IFIFOAB1, 0, OFIFO, 0, 0, IMMED); /* Write ICV */ - append_seq_store(desc, ctx->authsize, LDST_CLASS_2_CCB | - LDST_SRCDST_BYTE_CONTEXT); + SEQSTORE(p, CONTEXT2, 0, ctx->authsize, 0); + + PATCH_JUMP(p, pskip_key_load, skip_key_load); + PATCH_MOVE(p, pread_move_cmd, read_move_cmd); + PATCH_MOVE(p, pwrite_move_cmd, write_move_cmd); - ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + PROGRAM_FINALIZE(p); + + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_enc_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -302,8 +308,7 @@ static int aead_null_set_sh_desc(struct crypto_aead *aead) #ifdef DEBUG print_hex_dump(KERN_ERR, "aead null enc shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif /* @@ -315,78 +320,80 @@ static int aead_null_set_sh_desc(struct crypto_aead *aead) ctx->split_key_pad_len <= CAAM_DESC_BYTES_MAX) keys_fit_inline = true; + /* aead_decrypt shared descriptor */ desc = ctx->sh_desc_dec; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - /* aead_decrypt shared descriptor */ - init_sh_desc(desc, HDR_SHARE_SERIAL); + SHR_HDR(p, SHR_SERIAL, 1, 0); /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); + pskip_key_load = JUMP(p, skip_key_load, LOCAL_JUMP, ALL_TRUE, SHRD); if (keys_fit_inline) - append_key_as_imm(desc, ctx->key, ctx->split_key_pad_len, - ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); + KEY(p, MDHA_SPLIT_KEY, ENC, (uintptr_t)ctx->key, + ctx->split_key_len, IMMED | COPY); else - append_key(desc, ctx->key_dma, ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); - set_jump_tgt_here(desc, key_jump_cmd); + KEY(p, MDHA_SPLIT_KEY, ENC, ctx->key_dma, ctx->split_key_len, + 0); + SET_LABEL(p, skip_key_load); /* Class 2 operation */ - append_operation(desc, ctx->class2_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON); + ALG_OPERATION(p, ctx->class2_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class2_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_ENABLE, DIR_DEC); /* assoclen + cryptlen = seqinlen - ivsize - authsize */ - append_math_sub_imm_u32(desc, REG3, SEQINLEN, IMM, - ctx->authsize + tfm->ivsize); + MATHB(p, SEQINSZ, SUB, ctx->authsize + tfm->ivsize, MATH3, CAAM_CMD_SZ, + IMMED2); /* assoclen = (assoclen + cryptlen) - cryptlen */ - append_math_sub(desc, REG2, SEQOUTLEN, REG0, CAAM_CMD_SZ); - append_math_sub(desc, VARSEQINLEN, REG3, REG2, CAAM_CMD_SZ); + MATHB(p, SEQOUTSZ, SUB, MATH0, MATH2, CAAM_CMD_SZ, 0); + MATHB(p, MATH3, SUB, MATH2, VSEQINSZ, CAAM_CMD_SZ, 0); /* read assoc before reading payload */ - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | - KEY_VLF); + SEQFIFOLOAD(p, MSG2, 0 , VLF); /* Prepare to read and write cryptlen bytes */ - append_math_add(desc, VARSEQINLEN, ZERO, REG2, CAAM_CMD_SZ); - append_math_add(desc, VARSEQOUTLEN, ZERO, REG2, CAAM_CMD_SZ); + MATHB(p, ZERO, ADD, MATH2, VSEQINSZ, CAAM_CMD_SZ, 0); + MATHB(p, ZERO, ADD, MATH2, VSEQOUTSZ, CAAM_CMD_SZ, 0); /* * MOVE_LEN opcode is not available in all SEC HW revisions, * thus need to do some magic, i.e. self-patch the descriptor * buffer. */ - read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | - MOVE_DEST_MATH2 | - (0x6 << MOVE_LEN_SHIFT)); - write_move_cmd = append_move(desc, MOVE_SRC_MATH2 | - MOVE_DEST_DESCBUF | - MOVE_WAITCOMP | - (0x8 << MOVE_LEN_SHIFT)); + pread_move_cmd = MOVE(p, DESCBUF, 0, MATH2, 0, 6, IMMED); + pwrite_move_cmd = MOVE(p, MATH2, 0, DESCBUF, 0, 8, WAITCOMP | IMMED); /* Read and write cryptlen bytes */ - aead_append_src_dst(desc, FIFOLD_TYPE_MSG | FIFOLD_TYPE_FLUSH1); + SEQFIFOSTORE(p, MSG, 0, 0, VLF); + SEQFIFOLOAD(p, MSGINSNOOP, 0, VLF | LAST1 | LAST2 | FLUSH1); /* * Insert a NOP here, since we need at least 4 instructions between * code patching the descriptor buffer and the location being patched. */ - jump_cmd = append_jump(desc, JUMP_TEST_ALL); - set_jump_tgt_here(desc, jump_cmd); + pnop_cmd = JUMP(p, nop_cmd, LOCAL_JUMP, ALL_TRUE, 0); + SET_LABEL(p, nop_cmd); - set_move_tgt_here(desc, read_move_cmd); - set_move_tgt_here(desc, write_move_cmd); - append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO); - append_move(desc, MOVE_SRC_INFIFO_CL | MOVE_DEST_OUTFIFO | - MOVE_AUX_LS); - append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO); + SET_LABEL(p, read_move_cmd); + SET_LABEL(p, write_move_cmd); + LOAD(p, 0, DCTRL, LDOFF_DISABLE_AUTO_NFIFO, 0, IMMED); + MOVE(p, IFIFOAB1, 0, OFIFO, 0, 0, IMMED); + LOAD(p, 0, DCTRL, LDOFF_ENABLE_AUTO_NFIFO, 0, IMMED); /* Load ICV */ - append_seq_fifo_load(desc, ctx->authsize, FIFOLD_CLASS_CLASS2 | - FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV); + SEQFIFOLOAD(p, ICV2, ctx->authsize, LAST2); + + PATCH_JUMP(p, pskip_key_load, skip_key_load); + PATCH_JUMP(p, pnop_cmd, nop_cmd); + PATCH_MOVE(p, pread_move_cmd, read_move_cmd); + PATCH_MOVE(p, pwrite_move_cmd, write_move_cmd); - ctx->sh_desc_dec_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + PROGRAM_FINALIZE(p); + + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_dec_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_dec_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -395,8 +402,7 @@ static int aead_null_set_sh_desc(struct crypto_aead *aead) #ifdef DEBUG print_hex_dump(KERN_ERR, "aead null dec shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif return 0; @@ -410,6 +416,9 @@ static int aead_set_sh_desc(struct crypto_aead *aead) bool keys_fit_inline = false; u32 geniv, moveiv; u32 *desc; + struct program prg; + struct program *p = &prg; + unsigned desc_bytes; if (!ctx->authsize) return 0; @@ -429,42 +438,50 @@ static int aead_set_sh_desc(struct crypto_aead *aead) /* aead_encrypt shared descriptor */ desc = ctx->sh_desc_enc; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - init_sh_desc_key_aead(desc, ctx, keys_fit_inline); + init_sh_desc_key_aead(p, ctx, keys_fit_inline); /* Class 2 operation */ - append_operation(desc, ctx->class2_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->class2_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class2_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_ENC); /* cryptlen = seqoutlen - authsize */ - append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize); + MATHB(p, SEQOUTSZ, SUB, ctx->authsize, MATH3, CAAM_CMD_SZ, IMMED2); /* assoclen + cryptlen = seqinlen - ivsize */ - append_math_sub_imm_u32(desc, REG2, SEQINLEN, IMM, tfm->ivsize); + MATHB(p, SEQINSZ, SUB, tfm->ivsize, MATH2, CAAM_CMD_SZ, IMMED2); /* assoclen = (assoclen + cryptlen) - cryptlen */ - append_math_sub(desc, VARSEQINLEN, REG2, REG3, CAAM_CMD_SZ); + MATHB(p, MATH2, SUB, MATH3, VSEQINSZ, CAAM_CMD_SZ, 0); /* read assoc before reading payload */ - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | - KEY_VLF); - aead_append_ld_iv(desc, tfm->ivsize); + SEQFIFOLOAD(p, MSG2, 0 , VLF); + aead_append_ld_iv(p, tfm->ivsize); /* Class 1 operation */ - append_operation(desc, ctx->class1_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->class1_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class1_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_ENC); /* Read and write cryptlen bytes */ - append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ); - append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); - aead_append_src_dst(desc, FIFOLD_TYPE_MSG1OUT2); + MATHB(p, ZERO, ADD, MATH3, VSEQINSZ, CAAM_CMD_SZ, 0); + MATHB(p, ZERO, ADD, MATH3, VSEQOUTSZ, CAAM_CMD_SZ, 0); + + /* Read and write payload */ + SEQFIFOSTORE(p, MSG, 0, 0, VLF); + SEQFIFOLOAD(p, MSGOUTSNOOP, 0, VLF | LAST1 | LAST2); /* Write ICV */ - append_seq_store(desc, ctx->authsize, LDST_CLASS_2_CCB | - LDST_SRCDST_BYTE_CONTEXT); + SEQSTORE(p, CONTEXT2, 0, ctx->authsize, 0); - ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + PROGRAM_FINALIZE(p); + + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_enc_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -472,8 +489,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) } #ifdef DEBUG print_hex_dump(KERN_ERR, "aead enc shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif /* @@ -488,39 +504,46 @@ static int aead_set_sh_desc(struct crypto_aead *aead) /* aead_decrypt shared descriptor */ desc = ctx->sh_desc_dec; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - init_sh_desc_key_aead(desc, ctx, keys_fit_inline); + init_sh_desc_key_aead(p, ctx, keys_fit_inline); /* Class 2 operation */ - append_operation(desc, ctx->class2_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_DECRYPT | OP_ALG_ICV_ON); + ALG_OPERATION(p, ctx->class2_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class2_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_ENABLE, DIR_DEC); /* assoclen + cryptlen = seqinlen - ivsize - authsize */ - append_math_sub_imm_u32(desc, REG3, SEQINLEN, IMM, - ctx->authsize + tfm->ivsize); + MATHB(p, SEQINSZ, SUB, ctx->authsize + tfm->ivsize, MATH3, CAAM_CMD_SZ, + IMMED2); /* assoclen = (assoclen + cryptlen) - cryptlen */ - append_math_sub(desc, REG2, SEQOUTLEN, REG0, CAAM_CMD_SZ); - append_math_sub(desc, VARSEQINLEN, REG3, REG2, CAAM_CMD_SZ); + MATHB(p, SEQOUTSZ, SUB, MATH0, MATH2, CAAM_CMD_SZ, 0); + MATHB(p, MATH3, SUB, MATH2, VSEQINSZ, CAAM_CMD_SZ, 0); /* read assoc before reading payload */ - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | - KEY_VLF); + SEQFIFOLOAD(p, MSG2, 0 , VLF); - aead_append_ld_iv(desc, tfm->ivsize); + aead_append_ld_iv(p, tfm->ivsize); - append_dec_op1(desc, ctx->class1_alg_type); + append_dec_op1(p, ctx->class1_alg_type); /* Read and write cryptlen bytes */ - append_math_add(desc, VARSEQINLEN, ZERO, REG2, CAAM_CMD_SZ); - append_math_add(desc, VARSEQOUTLEN, ZERO, REG2, CAAM_CMD_SZ); - aead_append_src_dst(desc, FIFOLD_TYPE_MSG); + MATHB(p, ZERO, ADD, MATH2, VSEQINSZ, CAAM_CMD_SZ, 0); + MATHB(p, ZERO, ADD, MATH2, VSEQOUTSZ, CAAM_CMD_SZ, 0); + + /* Read and write payload */ + SEQFIFOSTORE(p, MSG, 0, 0, VLF); + SEQFIFOLOAD(p, MSGINSNOOP, 0, VLF | LAST1 | LAST2); /* Load ICV */ - append_seq_fifo_load(desc, ctx->authsize, FIFOLD_CLASS_CLASS2 | - FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_ICV); + SEQFIFOLOAD(p, ICV2, ctx->authsize, LAST2); - ctx->sh_desc_dec_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + PROGRAM_FINALIZE(p); + + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_dec_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_dec_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -528,8 +551,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) } #ifdef DEBUG print_hex_dump(KERN_ERR, "aead dec shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif /* @@ -544,67 +566,69 @@ static int aead_set_sh_desc(struct crypto_aead *aead) /* aead_givencrypt shared descriptor */ desc = ctx->sh_desc_givenc; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - init_sh_desc_key_aead(desc, ctx, keys_fit_inline); + init_sh_desc_key_aead(p, ctx, keys_fit_inline); /* Generate IV */ geniv = NFIFOENTRY_STYPE_PAD | NFIFOENTRY_DEST_DECO | NFIFOENTRY_DTYPE_MSG | NFIFOENTRY_LC1 | NFIFOENTRY_PTYPE_RND | (tfm->ivsize << NFIFOENTRY_DLEN_SHIFT); - append_load_imm_u32(desc, geniv, LDST_CLASS_IND_CCB | - LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM); - append_cmd(desc, CMD_LOAD | DISABLE_AUTO_INFO_FIFO); - append_move(desc, MOVE_SRC_INFIFO | - MOVE_DEST_CLASS1CTX | (tfm->ivsize << MOVE_LEN_SHIFT)); - append_cmd(desc, CMD_LOAD | ENABLE_AUTO_INFO_FIFO); + LOAD(p, geniv, NFIFO, 0, CAAM_CMD_SZ, IMMED); + LOAD(p, 0, DCTRL, LDOFF_DISABLE_AUTO_NFIFO, 0, IMMED); + MOVE(p, IFIFOABD, 0, CONTEXT1, 0, tfm->ivsize, IMMED); + LOAD(p, 0, DCTRL, LDOFF_ENABLE_AUTO_NFIFO, 0, IMMED); /* Copy IV to class 1 context */ - append_move(desc, MOVE_SRC_CLASS1CTX | - MOVE_DEST_OUTFIFO | (tfm->ivsize << MOVE_LEN_SHIFT)); + MOVE(p, CONTEXT1, 0, OFIFO, 0, tfm->ivsize, IMMED); /* Return to encryption */ - append_operation(desc, ctx->class2_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->class2_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class2_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_ENC); /* ivsize + cryptlen = seqoutlen - authsize */ - append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize); + MATHB(p, SEQOUTSZ, SUB, ctx->authsize, MATH3, CAAM_CMD_SZ, IMMED2); /* assoclen = seqinlen - (ivsize + cryptlen) */ - append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG3, CAAM_CMD_SZ); + MATHB(p, SEQINSZ, SUB, MATH3, VSEQINSZ, CAAM_CMD_SZ, 0); /* read assoc before reading payload */ - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | - KEY_VLF); + SEQFIFOLOAD(p, MSG2, 0, VLF); /* Copy iv from class 1 ctx to class 2 fifo*/ moveiv = NFIFOENTRY_STYPE_OFIFO | NFIFOENTRY_DEST_CLASS2 | NFIFOENTRY_DTYPE_MSG | (tfm->ivsize << NFIFOENTRY_DLEN_SHIFT); - append_load_imm_u32(desc, moveiv, LDST_CLASS_IND_CCB | - LDST_SRCDST_WORD_INFO_FIFO | LDST_IMM); - append_load_imm_u32(desc, tfm->ivsize, LDST_CLASS_2_CCB | - LDST_SRCDST_WORD_DATASZ_REG | LDST_IMM); + LOAD(p, moveiv, NFIFO, 0, CAAM_CMD_SZ, IMMED); + LOAD(p, tfm->ivsize, DATA2SZ, 0, CAAM_CMD_SZ, IMMED); /* Class 1 operation */ - append_operation(desc, ctx->class1_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->class1_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class1_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_ENC); /* Will write ivsize + cryptlen */ - append_math_add(desc, VARSEQOUTLEN, SEQINLEN, REG0, CAAM_CMD_SZ); + MATHB(p, SEQINSZ, ADD, MATH0, VSEQOUTSZ, CAAM_CMD_SZ, 0); /* Not need to reload iv */ - append_seq_fifo_load(desc, tfm->ivsize, - FIFOLD_CLASS_SKIP); + SEQFIFOLOAD(p, SKIP, tfm->ivsize, 0); /* Will read cryptlen */ - append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ); - aead_append_src_dst(desc, FIFOLD_TYPE_MSG1OUT2); + MATHB(p, SEQINSZ, ADD, MATH0, VSEQINSZ, CAAM_CMD_SZ, 0); + + /* Read and write payload */ + SEQFIFOSTORE(p, MSG, 0, 0, VLF); + SEQFIFOLOAD(p, MSGOUTSNOOP, 0, VLF | LAST1 | LAST2); /* Write ICV */ - append_seq_store(desc, ctx->authsize, LDST_CLASS_2_CCB | - LDST_SRCDST_BYTE_CONTEXT); + SEQSTORE(p, CONTEXT2, 0, ctx->authsize, 0); - ctx->sh_desc_givenc_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + PROGRAM_FINALIZE(p); + + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_givenc_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_givenc_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -612,8 +636,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) } #ifdef DEBUG print_hex_dump(KERN_ERR, "aead givenc shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif return 0; @@ -633,16 +656,13 @@ static int aead_setauthsize(struct crypto_aead *authenc, static u32 gen_split_aead_key(struct caam_ctx *ctx, const u8 *key_in, u32 authkeylen) { - return gen_split_key(ctx->jrdev, ctx->key, ctx->split_key_len, - ctx->split_key_pad_len, key_in, authkeylen, - ctx->alg_op); + return gen_split_key(ctx->jrdev, ctx->key, ctx->split_key_pad_len, + key_in, authkeylen, ctx->class2_alg_type); } static int aead_setkey(struct crypto_aead *aead, const u8 *key, unsigned int keylen) { - /* Sizes for MDHA pads (*not* keys): MD5, SHA1, 224, 256, 384, 512 */ - static const u8 mdpadlen[] = { 16, 20, 32, 32, 64, 64 }; struct caam_ctx *ctx = crypto_aead_ctx(aead); struct device *jrdev = ctx->jrdev; struct crypto_authenc_keys keys; @@ -651,10 +671,11 @@ static int aead_setkey(struct crypto_aead *aead, if (crypto_authenc_extractkeys(&keys, key, keylen) != 0) goto badkey; - /* Pick class 2 key length from algorithm submask */ - ctx->split_key_len = mdpadlen[(ctx->alg_op & OP_ALG_ALGSEL_SUBMASK) >> - OP_ALG_ALGSEL_SHIFT] * 2; - ctx->split_key_pad_len = ALIGN(ctx->split_key_len, 16); + /* Compute class 2 key length */ + ctx->split_key_len = split_key_len(ctx->class2_alg_type & + OP_ALG_ALGSEL_MASK); + ctx->split_key_pad_len = split_key_pad_len(ctx->class2_alg_type & + OP_ALG_ALGSEL_MASK); if (ctx->split_key_pad_len + keys.enckeylen > CAAM_MAX_KEY_SIZE) goto badkey; @@ -710,8 +731,12 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, struct ablkcipher_tfm *tfm = &ablkcipher->base.crt_ablkcipher; struct device *jrdev = ctx->jrdev; int ret = 0; - u32 *key_jump_cmd; u32 *desc; + struct program prg; + struct program *p = &prg; + unsigned desc_bytes; + LABEL(key_jump_cmd); + REFERENCE(pkey_jump_cmd); #ifdef DEBUG print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ", @@ -729,31 +754,36 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, /* ablkcipher_encrypt shared descriptor */ desc = ctx->sh_desc_enc; - init_sh_desc(desc, HDR_SHARE_SERIAL); + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + SHR_HDR(p, SHR_SERIAL, 1, 0); /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); + pkey_jump_cmd = JUMP(p, key_jump_cmd, LOCAL_JUMP, ALL_TRUE, SHRD); /* Load class1 key only */ - append_key_as_imm(desc, (void *)ctx->key, ctx->enckeylen, - ctx->enckeylen, CLASS_1 | - KEY_DEST_CLASS_REG); + KEY(p, KEY1, 0, (uintptr_t)ctx->key, ctx->enckeylen, IMMED | COPY); - set_jump_tgt_here(desc, key_jump_cmd); + SET_LABEL(p, key_jump_cmd); - /* Load iv */ - append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_1_CCB | tfm->ivsize); + /* Load IV */ + SEQLOAD(p, CONTEXT1, 0, tfm->ivsize, 0); /* Load operation */ - append_operation(desc, ctx->class1_alg_type | - OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->class1_alg_type & OP_ALG_ALGSEL_MASK, + ctx->class1_alg_type & OP_ALG_AAI_MASK, + OP_ALG_AS_INITFINAL, ICV_CHECK_DISABLE, DIR_ENC); /* Perform operation */ - ablkcipher_append_src_dst(desc); + ablkcipher_append_src_dst(p); + + PATCH_JUMP(p, pkey_jump_cmd, key_jump_cmd); + + PROGRAM_FINALIZE(p); - ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_enc_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -762,36 +792,40 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, #ifdef DEBUG print_hex_dump(KERN_ERR, "ablkcipher enc shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif + /* ablkcipher_decrypt shared descriptor */ desc = ctx->sh_desc_dec; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + SHR_HDR(p, SHR_SERIAL, 1, 0); - init_sh_desc(desc, HDR_SHARE_SERIAL); /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); + pkey_jump_cmd = JUMP(p, key_jump_cmd, LOCAL_JUMP, ALL_TRUE, SHRD); /* Load class1 key only */ - append_key_as_imm(desc, (void *)ctx->key, ctx->enckeylen, - ctx->enckeylen, CLASS_1 | - KEY_DEST_CLASS_REG); + KEY(p, KEY1, 0, (uintptr_t)ctx->key, ctx->enckeylen, IMMED | COPY); - set_jump_tgt_here(desc, key_jump_cmd); + SET_LABEL(p, key_jump_cmd); /* load IV */ - append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_1_CCB | tfm->ivsize); + SEQLOAD(p, CONTEXT1, 0, tfm->ivsize, 0); /* Choose operation */ - append_dec_op1(desc, ctx->class1_alg_type); + append_dec_op1(p, ctx->class1_alg_type); /* Perform operation */ - ablkcipher_append_src_dst(desc); + ablkcipher_append_src_dst(p); + + PATCH_JUMP(p, pkey_jump_cmd, key_jump_cmd); + + PROGRAM_FINALIZE(p); - ctx->sh_desc_dec_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + desc_bytes = DESC_BYTES(desc); + ctx->sh_desc_dec_dma = dma_map_single(jrdev, desc, desc_bytes, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_dec_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -801,8 +835,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, #ifdef DEBUG print_hex_dump(KERN_ERR, "ablkcipher dec shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes, 1); #endif return ret; @@ -1081,9 +1114,11 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr, int ivsize = crypto_aead_ivsize(aead); int authsize = ctx->authsize; u32 *desc = edesc->hw_desc; - u32 out_options = 0, in_options; + u32 out_options = EXT, in_options = EXT; dma_addr_t dst_dma, src_dma; - int len, sec4_sg_index = 0; + unsigned len, sec4_sg_index = 0; + struct program prg; + struct program *p = &prg; #ifdef DEBUG debug("assoclen %d cryptlen %d authsize %d\n", @@ -1098,25 +1133,28 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr, DUMP_PREFIX_ADDRESS, 16, 4, sg_virt(req->src), edesc->src_nents ? 100 : req->cryptlen, 1); print_hex_dump(KERN_ERR, "shrdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, sh_desc, - desc_bytes(sh_desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, sh_desc, DESC_BYTES(sh_desc), + 1); #endif - len = desc_len(sh_desc); - init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE); + len = DESC_LEN(sh_desc); + PROGRAM_CNTXT_INIT(p, desc, len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, len, ptr, REO | SHR); if (all_contig) { src_dma = sg_dma_address(req->assoc); - in_options = 0; } else { src_dma = edesc->sec4_sg_dma; sec4_sg_index += (edesc->assoc_nents ? : 1) + 1 + (edesc->src_nents ? : 1); - in_options = LDST_SGF; + in_options |= SGF; } - append_seq_in_ptr(desc, src_dma, req->assoclen + ivsize + req->cryptlen, - in_options); + SEQINPTR(p, src_dma, req->assoclen + ivsize + req->cryptlen, + in_options); if (likely(req->src == req->dst)) { if (all_contig) { @@ -1124,7 +1162,7 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr, } else { dst_dma = src_dma + sizeof(struct sec4_sg_entry) * ((edesc->assoc_nents ? : 1) + 1); - out_options = LDST_SGF; + out_options |= SGF; } } else { if (!edesc->dst_nents) { @@ -1133,15 +1171,15 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr, dst_dma = edesc->sec4_sg_dma + sec4_sg_index * sizeof(struct sec4_sg_entry); - out_options = LDST_SGF; + out_options |= SGF; } } if (encrypt) - append_seq_out_ptr(desc, dst_dma, req->cryptlen + authsize, - out_options); + SEQOUTPTR(p, dst_dma, req->cryptlen + authsize, out_options); else - append_seq_out_ptr(desc, dst_dma, req->cryptlen - authsize, - out_options); + SEQOUTPTR(p, dst_dma, req->cryptlen - authsize, out_options); + + PROGRAM_FINALIZE(p); } /* @@ -1157,9 +1195,11 @@ static void init_aead_giv_job(u32 *sh_desc, dma_addr_t ptr, int ivsize = crypto_aead_ivsize(aead); int authsize = ctx->authsize; u32 *desc = edesc->hw_desc; - u32 out_options = 0, in_options; + u32 out_options = EXT, in_options = EXT; dma_addr_t dst_dma, src_dma; - int len, sec4_sg_index = 0; + unsigned len, sec4_sg_index = 0; + struct program prg; + struct program *p = &prg; #ifdef DEBUG debug("assoclen %d cryptlen %d authsize %d\n", @@ -1173,23 +1213,26 @@ static void init_aead_giv_job(u32 *sh_desc, dma_addr_t ptr, DUMP_PREFIX_ADDRESS, 16, 4, sg_virt(req->src), edesc->src_nents > 1 ? 100 : req->cryptlen, 1); print_hex_dump(KERN_ERR, "shrdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, sh_desc, - desc_bytes(sh_desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, sh_desc, DESC_BYTES(sh_desc), + 1); #endif - len = desc_len(sh_desc); - init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE); + len = DESC_LEN(sh_desc); + PROGRAM_CNTXT_INIT(p, desc, len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, len, ptr, REO | SHR); if (contig & GIV_SRC_CONTIG) { src_dma = sg_dma_address(req->assoc); - in_options = 0; } else { src_dma = edesc->sec4_sg_dma; sec4_sg_index += edesc->assoc_nents + 1 + edesc->src_nents; - in_options = LDST_SGF; + in_options |= SGF; } - append_seq_in_ptr(desc, src_dma, req->assoclen + ivsize + req->cryptlen, - in_options); + SEQINPTR(p, src_dma, req->assoclen + ivsize + req->cryptlen, + in_options); if (contig & GIV_DST_CONTIG) { dst_dma = edesc->iv_dma; @@ -1197,17 +1240,18 @@ static void init_aead_giv_job(u32 *sh_desc, dma_addr_t ptr, if (likely(req->src == req->dst)) { dst_dma = src_dma + sizeof(struct sec4_sg_entry) * edesc->assoc_nents; - out_options = LDST_SGF; + out_options |= SGF; } else { dst_dma = edesc->sec4_sg_dma + sec4_sg_index * sizeof(struct sec4_sg_entry); - out_options = LDST_SGF; + out_options |= SGF; } } - append_seq_out_ptr(desc, dst_dma, ivsize + req->cryptlen + authsize, - out_options); + SEQOUTPTR(p, dst_dma, ivsize + req->cryptlen + authsize, out_options); + + PROGRAM_FINALIZE(p); } /* @@ -1221,9 +1265,11 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr, struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req); int ivsize = crypto_ablkcipher_ivsize(ablkcipher); u32 *desc = edesc->hw_desc; - u32 out_options = 0, in_options; + u32 out_options = EXT, in_options = EXT; dma_addr_t dst_dma, src_dma; - int len, sec4_sg_index = 0; + unsigned len, sec4_sg_index = 0; + struct program prg; + struct program *p = &prg; #ifdef DEBUG print_hex_dump(KERN_ERR, "presciv@"__stringify(__LINE__)": ", @@ -1234,18 +1280,21 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr, edesc->src_nents ? 100 : req->nbytes, 1); #endif - len = desc_len(sh_desc); - init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE); + len = DESC_LEN(sh_desc); + PROGRAM_CNTXT_INIT(p, desc, len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, len, ptr, REO | SHR); if (iv_contig) { src_dma = edesc->iv_dma; - in_options = 0; } else { src_dma = edesc->sec4_sg_dma; sec4_sg_index += (iv_contig ? 0 : 1) + edesc->src_nents; - in_options = LDST_SGF; + in_options |= SGF; } - append_seq_in_ptr(desc, src_dma, req->nbytes + ivsize, in_options); + SEQINPTR(p, src_dma, req->nbytes + ivsize, in_options); if (likely(req->src == req->dst)) { if (!edesc->src_nents && iv_contig) { @@ -1253,7 +1302,7 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr, } else { dst_dma = edesc->sec4_sg_dma + sizeof(struct sec4_sg_entry); - out_options = LDST_SGF; + out_options |= SGF; } } else { if (!edesc->dst_nents) { @@ -1261,10 +1310,13 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr, } else { dst_dma = edesc->sec4_sg_dma + sec4_sg_index * sizeof(struct sec4_sg_entry); - out_options = LDST_SGF; + out_options |= SGF; } } - append_seq_out_ptr(desc, dst_dma, req->nbytes, out_options); + + SEQOUTPTR(p, dst_dma, req->nbytes, out_options); + + PROGRAM_FINALIZE(p); } /* @@ -1406,7 +1458,7 @@ static int aead_encrypt(struct aead_request *req) #ifdef DEBUG print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + DESC_BYTES(edesc->hw_desc), 1); #endif desc = edesc->hw_desc; @@ -1449,7 +1501,7 @@ static int aead_decrypt(struct aead_request *req) #ifdef DEBUG print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + DESC_BYTES(edesc->hw_desc), 1); #endif desc = edesc->hw_desc; @@ -1612,7 +1664,7 @@ static int aead_givencrypt(struct aead_givcrypt_request *areq) #ifdef DEBUG print_hex_dump(KERN_ERR, "aead jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + DESC_BYTES(edesc->hw_desc), 1); #endif desc = edesc->hw_desc; @@ -1755,7 +1807,7 @@ static int ablkcipher_encrypt(struct ablkcipher_request *req) #ifdef DEBUG print_hex_dump(KERN_ERR, "ablkcipher jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + DESC_BYTES(edesc->hw_desc), 1); #endif desc = edesc->hw_desc; ret = caam_jr_enqueue(jrdev, desc, ablkcipher_encrypt_done, req); @@ -1793,7 +1845,7 @@ static int ablkcipher_decrypt(struct ablkcipher_request *req) #ifdef DEBUG print_hex_dump(KERN_ERR, "ablkcipher jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + DESC_BYTES(edesc->hw_desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ablkcipher_decrypt_done, req); @@ -1824,7 +1876,6 @@ struct caam_alg_template { } template_u; u32 class1_alg_type; u32 class2_alg_type; - u32 alg_op; }; static struct caam_alg_template driver_algs[] = { @@ -1846,7 +1897,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = 0, .class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha1),ecb(cipher_null))", @@ -1865,7 +1915,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = 0, .class2_alg_type = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha224),ecb(cipher_null))", @@ -1885,7 +1934,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = 0, .class2_alg_type = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha256),ecb(cipher_null))", @@ -1905,7 +1953,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = 0, .class2_alg_type = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha384),ecb(cipher_null))", @@ -1925,7 +1972,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = 0, .class2_alg_type = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha512),ecb(cipher_null))", @@ -1945,7 +1991,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = 0, .class2_alg_type = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(md5),cbc(aes))", @@ -1964,7 +2009,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha1),cbc(aes))", @@ -1983,7 +2027,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha224),cbc(aes))", @@ -2003,7 +2046,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha256),cbc(aes))", @@ -2023,7 +2065,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha384),cbc(aes))", @@ -2043,7 +2084,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC, }, { @@ -2064,7 +2104,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(md5),cbc(des3_ede))", @@ -2083,7 +2122,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha1),cbc(des3_ede))", @@ -2102,7 +2140,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha224),cbc(des3_ede))", @@ -2122,7 +2159,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha256),cbc(des3_ede))", @@ -2142,7 +2178,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha384),cbc(des3_ede))", @@ -2162,7 +2197,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha512),cbc(des3_ede))", @@ -2182,7 +2216,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(md5),cbc(des))", @@ -2201,7 +2234,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha1),cbc(des))", @@ -2220,7 +2252,6 @@ static struct caam_alg_template driver_algs[] = { }, .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha224),cbc(des))", @@ -2240,7 +2271,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha256),cbc(des))", @@ -2260,7 +2290,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha384),cbc(des))", @@ -2280,7 +2309,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC, }, { .name = "authenc(hmac(sha512),cbc(des))", @@ -2300,7 +2328,6 @@ static struct caam_alg_template driver_algs[] = { .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC, .class2_alg_type = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC_PRECOMP, - .alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC, }, /* ablkcipher descriptor */ { @@ -2357,7 +2384,6 @@ struct caam_crypto_alg { struct list_head entry; int class1_alg_type; int class2_alg_type; - int alg_op; struct crypto_alg crypto_alg; }; @@ -2377,7 +2403,6 @@ static int caam_cra_init(struct crypto_tfm *tfm) /* copy descriptor header template value */ ctx->class1_alg_type = OP_TYPE_CLASS1_ALG | caam_alg->class1_alg_type; ctx->class2_alg_type = OP_TYPE_CLASS2_ALG | caam_alg->class2_alg_type; - ctx->alg_op = OP_TYPE_CLASS2_ALG | caam_alg->alg_op; return 0; } @@ -2389,15 +2414,15 @@ static void caam_cra_exit(struct crypto_tfm *tfm) if (ctx->sh_desc_enc_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_enc_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_enc_dma, - desc_bytes(ctx->sh_desc_enc), DMA_TO_DEVICE); + DESC_BYTES(ctx->sh_desc_enc), DMA_TO_DEVICE); if (ctx->sh_desc_dec_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_dec_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_dec_dma, - desc_bytes(ctx->sh_desc_dec), DMA_TO_DEVICE); + DESC_BYTES(ctx->sh_desc_dec), DMA_TO_DEVICE); if (ctx->sh_desc_givenc_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_givenc_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_givenc_dma, - desc_bytes(ctx->sh_desc_givenc), + DESC_BYTES(ctx->sh_desc_givenc), DMA_TO_DEVICE); if (ctx->key_dma && !dma_mapping_error(ctx->jrdev, ctx->key_dma)) @@ -2462,7 +2487,6 @@ static struct caam_crypto_alg *caam_alg_alloc(struct caam_alg_template t_alg->class1_alg_type = template->class1_alg_type; t_alg->class2_alg_type = template->class2_alg_type; - t_alg->alg_op = template->alg_op; return t_alg; } diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 386efb9e192c..529e3ca92406 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -57,7 +57,8 @@ #include "regs.h" #include "intern.h" -#include "desc_constr.h" +#include "flib/rta.h" +#include "flib/desc/common.h" #include "jr.h" #include "error.h" #include "sg_sw_sec4.h" @@ -96,6 +97,7 @@ static struct list_head hash_list; +static const bool ps = (sizeof(dma_addr_t) == sizeof(u64)); /* ahash per-session context */ struct caam_hash_ctx { @@ -111,7 +113,6 @@ struct caam_hash_ctx { dma_addr_t sh_desc_digest_dma; dma_addr_t sh_desc_finup_dma; u32 alg_type; - u32 alg_op; u8 key[CAAM_MAX_HASH_KEY_SIZE]; dma_addr_t key_dma; int ctx_len; @@ -137,7 +138,7 @@ struct caam_hash_state { /* Common job descriptor seq in/out ptr routines */ /* Map state->caam_ctx, and append seq_out_ptr command that points to it */ -static inline int map_seq_out_ptr_ctx(u32 *desc, struct device *jrdev, +static inline int map_seq_out_ptr_ctx(struct program *p, struct device *jrdev, struct caam_hash_state *state, int ctx_len) { @@ -148,19 +149,20 @@ static inline int map_seq_out_ptr_ctx(u32 *desc, struct device *jrdev, return -ENOMEM; } - append_seq_out_ptr(desc, state->ctx_dma, ctx_len, 0); + SEQOUTPTR(p, state->ctx_dma, ctx_len, EXT); return 0; } /* Map req->result, and append seq_out_ptr command that points to it */ -static inline dma_addr_t map_seq_out_ptr_result(u32 *desc, struct device *jrdev, +static inline dma_addr_t map_seq_out_ptr_result(struct program *p, + struct device *jrdev, u8 *result, int digestsize) { dma_addr_t dst_dma; dst_dma = dma_map_single(jrdev, result, digestsize, DMA_FROM_DEVICE); - append_seq_out_ptr(desc, dst_dma, digestsize, 0); + SEQOUTPTR(p, dst_dma, digestsize, EXT); return dst_dma; } @@ -224,28 +226,32 @@ static inline int ctx_map_to_sec4_sg(u32 *desc, struct device *jrdev, } /* Common shared descriptor commands */ -static inline void append_key_ahash(u32 *desc, struct caam_hash_ctx *ctx) +static inline void append_key_ahash(struct program *p, + struct caam_hash_ctx *ctx) { - append_key_as_imm(desc, ctx->key, ctx->split_key_pad_len, - ctx->split_key_len, CLASS_2 | - KEY_DEST_MDHA_SPLIT | KEY_ENC); + KEY(p, MDHA_SPLIT_KEY, ENC, (uintptr_t)ctx->key, + ctx->split_key_len, IMMED | COPY); } /* Append key if it has been set */ -static inline void init_sh_desc_key_ahash(u32 *desc, struct caam_hash_ctx *ctx) +static inline void init_sh_desc_key_ahash(struct program *p, + struct caam_hash_ctx *ctx) { - u32 *key_jump_cmd; + LABEL(key_jump_cmd); + REFERENCE(pkey_jump_cmd); - init_sh_desc(desc, HDR_SHARE_SERIAL); + SHR_HDR(p, SHR_SERIAL, 1, 0); if (ctx->split_key_len) { /* Skip if already shared */ - key_jump_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | - JUMP_COND_SHRD); + pkey_jump_cmd = JUMP(p, key_jump_cmd, LOCAL_JUMP, ALL_TRUE, + SHRD); - append_key_ahash(desc, ctx); + append_key_ahash(p, ctx); - set_jump_tgt_here(desc, key_jump_cmd); + SET_LABEL(p, key_jump_cmd); + + PATCH_JUMP(p, pkey_jump_cmd, key_jump_cmd); } } @@ -254,55 +260,54 @@ static inline void init_sh_desc_key_ahash(u32 *desc, struct caam_hash_ctx *ctx) * and write resulting class2 context to seqout, which may be state->caam_ctx * or req->result */ -static inline void ahash_append_load_str(u32 *desc, int digestsize) +static inline void ahash_append_load_str(struct program *p, int digestsize) { /* Calculate remaining bytes to read */ - append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ); + MATHB(p, SEQINSZ, ADD, MATH0, VSEQINSZ, CAAM_CMD_SZ, 0); /* Read remaining bytes */ - append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_LAST2 | - FIFOLD_TYPE_MSG | KEY_VLF); + SEQFIFOLOAD(p, MSG2, 0, VLF | LAST2); /* Store class2 context bytes */ - append_seq_store(desc, digestsize, LDST_CLASS_2_CCB | - LDST_SRCDST_BYTE_CONTEXT); + SEQSTORE(p, CONTEXT2, 0, digestsize, 0); } /* * For ahash update, final and finup, import context, read and write to seqout */ -static inline void ahash_ctx_data_to_out(u32 *desc, u32 op, u32 state, +static inline void ahash_ctx_data_to_out(struct program *p, u32 op, u32 state, int digestsize, struct caam_hash_ctx *ctx) { - init_sh_desc_key_ahash(desc, ctx); + init_sh_desc_key_ahash(p, ctx); /* Import context from software */ - append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_2_CCB | ctx->ctx_len); + SEQLOAD(p, CONTEXT2, 0, ctx->ctx_len, 0); /* Class 2 operation */ - append_operation(desc, op | state | OP_ALG_ENCRYPT); + ALG_OPERATION(p, op & OP_ALG_ALGSEL_MASK, op & OP_ALG_AAI_MASK, state, + ICV_CHECK_DISABLE, DIR_ENC); /* * Load from buf and/or src and write to req->result or state->context */ - ahash_append_load_str(desc, digestsize); + ahash_append_load_str(p, digestsize); } /* For ahash firsts and digest, read and write to seqout */ -static inline void ahash_data_to_out(u32 *desc, u32 op, u32 state, +static inline void ahash_data_to_out(struct program *p, u32 op, u32 state, int digestsize, struct caam_hash_ctx *ctx) { - init_sh_desc_key_ahash(desc, ctx); + init_sh_desc_key_ahash(p, ctx); /* Class 2 operation */ - append_operation(desc, op | state | OP_ALG_ENCRYPT); + ALG_OPERATION(p, op & OP_ALG_ALGSEL_MASK, op & OP_ALG_AAI_MASK, state, + ICV_CHECK_DISABLE, DIR_ENC); /* * Load from buf and/or src and write to req->result or state->context */ - ahash_append_load_str(desc, digestsize); + ahash_append_load_str(p, digestsize); } static int ahash_set_sh_desc(struct crypto_ahash *ahash) @@ -312,27 +317,34 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) struct device *jrdev = ctx->jrdev; u32 have_key = 0; u32 *desc; + struct program prg; + struct program *p = &prg; if (ctx->split_key_len) have_key = OP_ALG_AAI_HMAC_PRECOMP; /* ahash_update shared descriptor */ desc = ctx->sh_desc_update; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - init_sh_desc(desc, HDR_SHARE_SERIAL); + SHR_HDR(p, SHR_SERIAL, 1, 0); /* Import context from software */ - append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_2_CCB | ctx->ctx_len); + SEQLOAD(p, CONTEXT2, 0, ctx->ctx_len, 0); /* Class 2 operation */ - append_operation(desc, ctx->alg_type | OP_ALG_AS_UPDATE | - OP_ALG_ENCRYPT); + ALG_OPERATION(p, ctx->alg_type & OP_ALG_ALGSEL_MASK, + ctx->alg_type & OP_ALG_AAI_MASK, OP_ALG_AS_UPDATE, + ICV_CHECK_DISABLE, DIR_ENC); /* Load data and write to result or context */ - ahash_append_load_str(desc, ctx->ctx_len); + ahash_append_load_str(p, ctx->ctx_len); + + PROGRAM_FINALIZE(p); - ctx->sh_desc_update_dma = dma_map_single(jrdev, desc, desc_bytes(desc), + ctx->sh_desc_update_dma = dma_map_single(jrdev, desc, DESC_BYTES(desc), DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_update_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -341,17 +353,22 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) #ifdef DEBUG print_hex_dump(KERN_ERR, "ahash update shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif /* ahash_update_first shared descriptor */ desc = ctx->sh_desc_update_first; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - ahash_data_to_out(desc, have_key | ctx->alg_type, OP_ALG_AS_INIT, + ahash_data_to_out(p, have_key | ctx->alg_type, OP_ALG_AS_INIT, ctx->ctx_len, ctx); + PROGRAM_FINALIZE(p); + ctx->sh_desc_update_first_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + DESC_BYTES(desc), DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_update_first_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -360,16 +377,21 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) #ifdef DEBUG print_hex_dump(KERN_ERR, "ahash update first shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif /* ahash_final shared descriptor */ desc = ctx->sh_desc_fin; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - ahash_ctx_data_to_out(desc, have_key | ctx->alg_type, - OP_ALG_AS_FINALIZE, digestsize, ctx); + ahash_ctx_data_to_out(p, have_key | ctx->alg_type, OP_ALG_AS_FINALIZE, + digestsize, ctx); - ctx->sh_desc_fin_dma = dma_map_single(jrdev, desc, desc_bytes(desc), + PROGRAM_FINALIZE(p); + + ctx->sh_desc_fin_dma = dma_map_single(jrdev, desc, DESC_BYTES(desc), DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_fin_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -377,17 +399,21 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) } #ifdef DEBUG print_hex_dump(KERN_ERR, "ahash final shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif /* ahash_finup shared descriptor */ desc = ctx->sh_desc_finup; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + ahash_ctx_data_to_out(p, have_key | ctx->alg_type, OP_ALG_AS_FINALIZE, + digestsize, ctx); - ahash_ctx_data_to_out(desc, have_key | ctx->alg_type, - OP_ALG_AS_FINALIZE, digestsize, ctx); + PROGRAM_FINALIZE(p); - ctx->sh_desc_finup_dma = dma_map_single(jrdev, desc, desc_bytes(desc), + ctx->sh_desc_finup_dma = dma_map_single(jrdev, desc, DESC_BYTES(desc), DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_finup_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -395,18 +421,21 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) } #ifdef DEBUG print_hex_dump(KERN_ERR, "ahash finup shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif /* ahash_digest shared descriptor */ desc = ctx->sh_desc_digest; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - ahash_data_to_out(desc, have_key | ctx->alg_type, OP_ALG_AS_INITFINAL, + ahash_data_to_out(p, have_key | ctx->alg_type, OP_ALG_AS_INITFINAL, digestsize, ctx); - ctx->sh_desc_digest_dma = dma_map_single(jrdev, desc, - desc_bytes(desc), + PROGRAM_FINALIZE(p); + + ctx->sh_desc_digest_dma = dma_map_single(jrdev, desc, DESC_BYTES(desc), DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_digest_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -415,8 +444,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) #ifdef DEBUG print_hex_dump(KERN_ERR, "ahash digest shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif return 0; @@ -425,9 +453,8 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) static int gen_split_hash_key(struct caam_hash_ctx *ctx, const u8 *key_in, u32 keylen) { - return gen_split_key(ctx->jrdev, ctx->key, ctx->split_key_len, - ctx->split_key_pad_len, key_in, keylen, - ctx->alg_op); + return gen_split_key(ctx->jrdev, ctx->key, ctx->split_key_pad_len, + key_in, keylen, ctx->alg_type); } /* Digest hash size if it is too large */ @@ -439,6 +466,8 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, struct split_key_result result; dma_addr_t src_dma, dst_dma; int ret = 0; + struct program prg; + struct program *p = &prg; desc = kmalloc(CAAM_CMD_SZ * 8 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA); if (!desc) { @@ -446,7 +475,11 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, return -ENOMEM; } - init_job_desc(desc, 0); + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_NEVER, 0, 0, 0); src_dma = dma_map_single(jrdev, (void *)key_in, *keylen, DMA_TO_DEVICE); @@ -465,20 +498,21 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, } /* Job descriptor to perform unkeyed hash on key_in */ - append_operation(desc, ctx->alg_type | OP_ALG_ENCRYPT | - OP_ALG_AS_INITFINAL); - append_seq_in_ptr(desc, src_dma, *keylen, 0); - append_seq_fifo_load(desc, *keylen, FIFOLD_CLASS_CLASS2 | - FIFOLD_TYPE_LAST2 | FIFOLD_TYPE_MSG); - append_seq_out_ptr(desc, dst_dma, digestsize, 0); - append_seq_store(desc, digestsize, LDST_CLASS_2_CCB | - LDST_SRCDST_BYTE_CONTEXT); + ALG_OPERATION(p, ctx->alg_type & OP_ALG_ALGSEL_MASK, + ctx->alg_type & OP_ALG_AAI_MASK, OP_ALG_AS_INITFINAL, + ICV_CHECK_DISABLE, DIR_ENC); + SEQINPTR(p, src_dma, *keylen, EXT); + SEQFIFOLOAD(p, MSG2, *keylen, LAST2); + SEQOUTPTR(p, dst_dma, digestsize, EXT); + SEQSTORE(p, CONTEXT2, 0, digestsize, 0); + + PROGRAM_FINALIZE(p); #ifdef DEBUG print_hex_dump(KERN_ERR, "key_in@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, key_in, *keylen, 1); print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif result.err = 0; @@ -509,8 +543,6 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, static int ahash_setkey(struct crypto_ahash *ahash, const u8 *key, unsigned int keylen) { - /* Sizes for MDHA pads (*not* keys): MD5, SHA1, 224, 256, 384, 512 */ - static const u8 mdpadlen[] = { 16, 20, 32, 32, 64, 64 }; struct caam_hash_ctx *ctx = crypto_ahash_ctx(ahash); struct device *jrdev = ctx->jrdev; int blocksize = crypto_tfm_alg_blocksize(&ahash->base); @@ -534,10 +566,10 @@ static int ahash_setkey(struct crypto_ahash *ahash, key = hashed_key; } - /* Pick class 2 key length from algorithm submask */ - ctx->split_key_len = mdpadlen[(ctx->alg_op & OP_ALG_ALGSEL_SUBMASK) >> - OP_ALG_ALGSEL_SHIFT] * 2; - ctx->split_key_pad_len = ALIGN(ctx->split_key_len, 16); + /* Compute class 2 key length */ + ctx->split_key_len = split_key_len(ctx->alg_type & OP_ALG_ALGSEL_MASK); + ctx->split_key_pad_len = split_key_pad_len(ctx->alg_type & + OP_ALG_ALGSEL_MASK); #ifdef DEBUG printk(KERN_ERR "split_key_len %d split_key_pad_len %d\n", @@ -783,7 +815,9 @@ static int ahash_update_ctx(struct ahash_request *req) struct ahash_edesc *edesc; bool chained = false; int ret = 0; - int sh_len; + unsigned sh_len; + struct program prg; + struct program *p = &prg; last_buflen = *next_buflen; *next_buflen = in_len & (crypto_tfm_alg_blocksize(&ahash->base) - 1); @@ -838,10 +872,13 @@ static int ahash_update_ctx(struct ahash_request *req) SEC4_SG_LEN_FIN; } - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | - HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg, sec4_sg_bytes, @@ -851,15 +888,16 @@ static int ahash_update_ctx(struct ahash_request *req) return -ENOMEM; } - append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len + - to_hash, LDST_SGF); + SEQINPTR(p, edesc->sec4_sg_dma, ctx->ctx_len + to_hash, + SGF | EXT); + SEQOUTPTR(p, state->ctx_dma, ctx->ctx_len, EXT); - append_seq_out_ptr(desc, state->ctx_dma, ctx->ctx_len, 0); + PROGRAM_FINALIZE(p); #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done_bi, req); @@ -904,7 +942,9 @@ static int ahash_final_ctx(struct ahash_request *req) int digestsize = crypto_ahash_digestsize(ahash); struct ahash_edesc *edesc; int ret = 0; - int sh_len; + unsigned sh_len; + struct program prg; + struct program *p = &prg; sec4_sg_bytes = (1 + (buflen ? 1 : 0)) * sizeof(struct sec4_sg_entry); @@ -916,9 +956,13 @@ static int ahash_final_ctx(struct ahash_request *req) return -ENOMEM; } - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); edesc->sec4_sg_bytes = sec4_sg_bytes; edesc->sec4_sg = (void *)edesc + sizeof(struct ahash_edesc) + @@ -942,19 +986,20 @@ static int ahash_final_ctx(struct ahash_request *req) return -ENOMEM; } - append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len + buflen, - LDST_SGF); + SEQINPTR(p, edesc->sec4_sg_dma, ctx->ctx_len + buflen, SGF | EXT); - edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, + edesc->dst_dma = map_seq_out_ptr_result(p, jrdev, req->result, digestsize); if (dma_mapping_error(jrdev, edesc->dst_dma)) { dev_err(jrdev, "unable to map dst\n"); return -ENOMEM; } + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_src, req); @@ -988,7 +1033,9 @@ static int ahash_finup_ctx(struct ahash_request *req) struct ahash_edesc *edesc; bool chained = false; int ret = 0; - int sh_len; + unsigned sh_len; + struct program prg; + struct program *p = &prg; src_nents = __sg_count(req->src, req->nbytes, &chained); sec4_sg_src_index = 1 + (buflen ? 1 : 0); @@ -1003,9 +1050,13 @@ static int ahash_finup_ctx(struct ahash_request *req) return -ENOMEM; } - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); edesc->src_nents = src_nents; edesc->chained = chained; @@ -1032,19 +1083,21 @@ static int ahash_finup_ctx(struct ahash_request *req) return -ENOMEM; } - append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len + - buflen + req->nbytes, LDST_SGF); + SEQINPTR(p, edesc->sec4_sg_dma, ctx->ctx_len + buflen + req->nbytes, + SGF | EXT); - edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, + edesc->dst_dma = map_seq_out_ptr_result(p, jrdev, req->result, digestsize); if (dma_mapping_error(jrdev, edesc->dst_dma)) { dev_err(jrdev, "unable to map dst\n"); return -ENOMEM; } + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_src, req); @@ -1073,8 +1126,10 @@ static int ahash_digest(struct ahash_request *req) struct ahash_edesc *edesc; bool chained = false; int ret = 0; - u32 options; - int sh_len; + u32 options = EXT; + unsigned sh_len; + struct program prg; + struct program *p = &prg; src_nents = sg_count(req->src, req->nbytes, &chained); dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, DMA_TO_DEVICE, @@ -1094,9 +1149,13 @@ static int ahash_digest(struct ahash_request *req) edesc->src_nents = src_nents; edesc->chained = chained; - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); if (src_nents) { sg_to_sec4_sg_last(req->src, src_nents, edesc->sec4_sg, 0); @@ -1107,23 +1166,24 @@ static int ahash_digest(struct ahash_request *req) return -ENOMEM; } src_dma = edesc->sec4_sg_dma; - options = LDST_SGF; + options |= SGF; } else { src_dma = sg_dma_address(req->src); - options = 0; } - append_seq_in_ptr(desc, src_dma, req->nbytes, options); + SEQINPTR(p, src_dma, req->nbytes, options); - edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, + edesc->dst_dma = map_seq_out_ptr_result(p, jrdev, req->result, digestsize); if (dma_mapping_error(jrdev, edesc->dst_dma)) { dev_err(jrdev, "unable to map dst\n"); return -ENOMEM; } + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done, req); @@ -1153,7 +1213,9 @@ static int ahash_final_no_ctx(struct ahash_request *req) int digestsize = crypto_ahash_digestsize(ahash); struct ahash_edesc *edesc; int ret = 0; - int sh_len; + unsigned sh_len; + struct program prg; + struct program *p = &prg; /* allocate space for base edesc and hw desc commands, link tables */ edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN, @@ -1163,9 +1225,13 @@ static int ahash_final_no_ctx(struct ahash_request *req) return -ENOMEM; } - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); state->buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, state->buf_dma)) { @@ -1173,19 +1239,22 @@ static int ahash_final_no_ctx(struct ahash_request *req) return -ENOMEM; } - append_seq_in_ptr(desc, state->buf_dma, buflen, 0); + SEQINPTR(p, state->buf_dma, buflen, EXT); - edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, + edesc->dst_dma = map_seq_out_ptr_result(p, jrdev, req->result, digestsize); if (dma_mapping_error(jrdev, edesc->dst_dma)) { dev_err(jrdev, "unable to map dst\n"); return -ENOMEM; } + + PROGRAM_FINALIZE(p); + edesc->src_nents = 0; #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done, req); @@ -1220,7 +1289,9 @@ static int ahash_update_no_ctx(struct ahash_request *req) dma_addr_t ptr = ctx->sh_desc_update_first_dma; bool chained = false; int ret = 0; - int sh_len; + unsigned sh_len; + struct program prg; + struct program *p = &prg; *next_buflen = in_len & (crypto_tfm_alg_blocksize(&ahash->base) - 1); to_hash = in_len - *next_buflen; @@ -1260,10 +1331,13 @@ static int ahash_update_no_ctx(struct ahash_request *req) state->current_buf = !state->current_buf; } - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | - HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg, sec4_sg_bytes, @@ -1273,16 +1347,18 @@ static int ahash_update_no_ctx(struct ahash_request *req) return -ENOMEM; } - append_seq_in_ptr(desc, edesc->sec4_sg_dma, to_hash, LDST_SGF); + SEQINPTR(p, edesc->sec4_sg_dma, to_hash, SGF | EXT); - ret = map_seq_out_ptr_ctx(desc, jrdev, state, ctx->ctx_len); + ret = map_seq_out_ptr_ctx(p, jrdev, state, ctx->ctx_len); if (ret) return ret; + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_dst, req); @@ -1331,8 +1407,10 @@ static int ahash_finup_no_ctx(struct ahash_request *req) int digestsize = crypto_ahash_digestsize(ahash); struct ahash_edesc *edesc; bool chained = false; - int sh_len; + unsigned sh_len; int ret = 0; + struct program prg; + struct program *p = &prg; src_nents = __sg_count(req->src, req->nbytes, &chained); sec4_sg_src_index = 2; @@ -1347,9 +1425,13 @@ static int ahash_finup_no_ctx(struct ahash_request *req) return -ENOMEM; } - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); edesc->src_nents = src_nents; edesc->chained = chained; @@ -1371,19 +1453,20 @@ static int ahash_finup_no_ctx(struct ahash_request *req) return -ENOMEM; } - append_seq_in_ptr(desc, edesc->sec4_sg_dma, buflen + - req->nbytes, LDST_SGF); + SEQINPTR(p, edesc->sec4_sg_dma, buflen + req->nbytes, SGF | EXT); - edesc->dst_dma = map_seq_out_ptr_result(desc, jrdev, req->result, + edesc->dst_dma = map_seq_out_ptr_result(p, jrdev, req->result, digestsize); if (dma_mapping_error(jrdev, edesc->dst_dma)) { dev_err(jrdev, "unable to map dst\n"); return -ENOMEM; } + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done, req); @@ -1414,11 +1497,13 @@ static int ahash_update_first(struct ahash_request *req) dma_addr_t ptr = ctx->sh_desc_update_first_dma; int sec4_sg_bytes, src_nents; dma_addr_t src_dma; - u32 options; + u32 options = EXT; struct ahash_edesc *edesc; bool chained = false; int ret = 0; - int sh_len; + unsigned sh_len; + struct program prg; + struct program *p = &prg; *next_buflen = req->nbytes & (crypto_tfm_alg_blocksize(&ahash->base) - 1); @@ -1462,30 +1547,34 @@ static int ahash_update_first(struct ahash_request *req) return -ENOMEM; } src_dma = edesc->sec4_sg_dma; - options = LDST_SGF; + options |= SGF; } else { src_dma = sg_dma_address(req->src); - options = 0; } if (*next_buflen) sg_copy_part(next_buf, req->src, to_hash, req->nbytes); - sh_len = desc_len(sh_desc); + sh_len = DESC_LEN(sh_desc); desc = edesc->hw_desc; - init_job_desc_shared(desc, ptr, sh_len, HDR_SHARE_DEFER | - HDR_REVERSE); + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_DEFER, sh_len, ptr, REO | SHR); - append_seq_in_ptr(desc, src_dma, to_hash, options); + SEQINPTR(p, src_dma, to_hash, options); - ret = map_seq_out_ptr_ctx(desc, jrdev, state, ctx->ctx_len); + ret = map_seq_out_ptr_ctx(p, jrdev, state, ctx->ctx_len); if (ret) return ret; + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DESC_BYTES(desc), 1); #endif ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_dst, @@ -1587,7 +1676,6 @@ struct caam_hash_template { unsigned int blocksize; struct ahash_alg template_ahash; u32 alg_type; - u32 alg_op; }; /* ahash descriptors */ @@ -1612,7 +1700,6 @@ static struct caam_hash_template driver_hash[] = { }, }, .alg_type = OP_ALG_ALGSEL_SHA1, - .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC, }, { .name = "sha224", .driver_name = "sha224-caam", @@ -1633,7 +1720,6 @@ static struct caam_hash_template driver_hash[] = { }, }, .alg_type = OP_ALG_ALGSEL_SHA224, - .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC, }, { .name = "sha256", .driver_name = "sha256-caam", @@ -1654,7 +1740,6 @@ static struct caam_hash_template driver_hash[] = { }, }, .alg_type = OP_ALG_ALGSEL_SHA256, - .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC, }, { .name = "sha384", .driver_name = "sha384-caam", @@ -1675,7 +1760,6 @@ static struct caam_hash_template driver_hash[] = { }, }, .alg_type = OP_ALG_ALGSEL_SHA384, - .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC, }, { .name = "sha512", .driver_name = "sha512-caam", @@ -1696,7 +1780,6 @@ static struct caam_hash_template driver_hash[] = { }, }, .alg_type = OP_ALG_ALGSEL_SHA512, - .alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC, }, { .name = "md5", .driver_name = "md5-caam", @@ -1717,14 +1800,12 @@ static struct caam_hash_template driver_hash[] = { }, }, .alg_type = OP_ALG_ALGSEL_MD5, - .alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC, }, }; struct caam_hash_alg { struct list_head entry; int alg_type; - int alg_op; struct ahash_alg ahash_alg; }; @@ -1759,9 +1840,8 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm) } /* copy descriptor header template value */ ctx->alg_type = OP_TYPE_CLASS2_ALG | caam_hash->alg_type; - ctx->alg_op = OP_TYPE_CLASS2_ALG | caam_hash->alg_op; - ctx->ctx_len = runninglen[(ctx->alg_op & OP_ALG_ALGSEL_SUBMASK) >> + ctx->ctx_len = runninglen[(ctx->alg_type & OP_ALG_ALGSEL_SUBMASK) >> OP_ALG_ALGSEL_SHIFT]; crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), @@ -1779,26 +1859,26 @@ static void caam_hash_cra_exit(struct crypto_tfm *tfm) if (ctx->sh_desc_update_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_update_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_update_dma, - desc_bytes(ctx->sh_desc_update), + DESC_BYTES(ctx->sh_desc_update), DMA_TO_DEVICE); if (ctx->sh_desc_update_first_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_update_first_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_update_first_dma, - desc_bytes(ctx->sh_desc_update_first), + DESC_BYTES(ctx->sh_desc_update_first), DMA_TO_DEVICE); if (ctx->sh_desc_fin_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_fin_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_fin_dma, - desc_bytes(ctx->sh_desc_fin), DMA_TO_DEVICE); + DESC_BYTES(ctx->sh_desc_fin), DMA_TO_DEVICE); if (ctx->sh_desc_digest_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_digest_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_digest_dma, - desc_bytes(ctx->sh_desc_digest), + DESC_BYTES(ctx->sh_desc_digest), DMA_TO_DEVICE); if (ctx->sh_desc_finup_dma && !dma_mapping_error(ctx->jrdev, ctx->sh_desc_finup_dma)) dma_unmap_single(ctx->jrdev, ctx->sh_desc_finup_dma, - desc_bytes(ctx->sh_desc_finup), DMA_TO_DEVICE); + DESC_BYTES(ctx->sh_desc_finup), DMA_TO_DEVICE); caam_jr_free(ctx->jrdev); } @@ -1857,7 +1937,6 @@ caam_hash_alloc(struct caam_hash_template *template, alg->cra_type = &crypto_ahash_type; t_alg->alg_type = template->alg_type; - t_alg->alg_op = template->alg_op; return t_alg; } diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index 5b288082e6ac..9bffa6168536 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -39,7 +39,7 @@ #include "regs.h" #include "intern.h" -#include "desc_constr.h" +#include "flib/rta.h" #include "jr.h" #include "error.h" @@ -77,6 +77,7 @@ struct caam_rng_ctx { }; static struct caam_rng_ctx *rng_ctx; +static const bool ps = (sizeof(dma_addr_t) == sizeof(u64)); static inline void rng_unmap_buf(struct device *jrdev, struct buf_data *bd) { @@ -91,7 +92,7 @@ static inline void rng_unmap_ctx(struct caam_rng_ctx *ctx) if (ctx->sh_desc_dma) dma_unmap_single(jrdev, ctx->sh_desc_dma, - desc_bytes(ctx->sh_desc), DMA_TO_DEVICE); + DESC_BYTES(ctx->sh_desc), DMA_TO_DEVICE); rng_unmap_buf(jrdev, &ctx->bufs[0]); rng_unmap_buf(jrdev, &ctx->bufs[1]); } @@ -189,16 +190,24 @@ static inline int rng_create_sh_desc(struct caam_rng_ctx *ctx) { struct device *jrdev = ctx->jrdev; u32 *desc = ctx->sh_desc; + struct program prg; + struct program *p = &prg; - init_sh_desc(desc, HDR_SHARE_SERIAL); + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + SHR_HDR(p, SHR_SERIAL, 1, 0); /* Generate random bytes */ - append_operation(desc, OP_ALG_ALGSEL_RNG | OP_TYPE_CLASS1_ALG); + ALG_OPERATION(p, OP_ALG_ALGSEL_RNG, OP_ALG_AAI_RNG, 0, 0, 0); /* Store bytes */ - append_seq_fifo_store(desc, RN_BUF_SIZE, FIFOST_TYPE_RNGSTORE); + SEQFIFOSTORE(p, RNG, 0, RN_BUF_SIZE, 0); + + PROGRAM_FINALIZE(p); - ctx->sh_desc_dma = dma_map_single(jrdev, desc, desc_bytes(desc), + ctx->sh_desc_dma = dma_map_single(jrdev, desc, DESC_BYTES(desc), DMA_TO_DEVICE); if (dma_mapping_error(jrdev, ctx->sh_desc_dma)) { dev_err(jrdev, "unable to map shared descriptor\n"); @@ -206,7 +215,7 @@ static inline int rng_create_sh_desc(struct caam_rng_ctx *ctx) } #ifdef DEBUG print_hex_dump(KERN_ERR, "rng shdesc@: ", DUMP_PREFIX_ADDRESS, 16, 4, - desc, desc_bytes(desc), 1); + desc, DESC_BYTES(desc), 1); #endif return 0; } @@ -216,10 +225,15 @@ static inline int rng_create_job_desc(struct caam_rng_ctx *ctx, int buf_id) struct device *jrdev = ctx->jrdev; struct buf_data *bd = &ctx->bufs[buf_id]; u32 *desc = bd->hw_desc; - int sh_len = desc_len(ctx->sh_desc); + unsigned sh_len = DESC_LEN(ctx->sh_desc); + struct program prg; + struct program *p = &prg; + + PROGRAM_CNTXT_INIT(p, desc, sh_len); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); - init_job_desc_shared(desc, ctx->sh_desc_dma, sh_len, HDR_SHARE_DEFER | - HDR_REVERSE); + JOB_HDR(p, SHR_DEFER, sh_len, ctx->sh_desc_dma, REO | SHR); bd->addr = dma_map_single(jrdev, bd->buf, RN_BUF_SIZE, DMA_FROM_DEVICE); if (dma_mapping_error(jrdev, bd->addr)) { @@ -227,10 +241,13 @@ static inline int rng_create_job_desc(struct caam_rng_ctx *ctx, int buf_id) return -ENOMEM; } - append_seq_out_ptr_intlen(desc, bd->addr, RN_BUF_SIZE, 0); + SEQOUTPTR(p, bd->addr, RN_BUF_SIZE, 0); + + PROGRAM_FINALIZE(p); + #ifdef DEBUG print_hex_dump(KERN_ERR, "rng job desc@: ", DUMP_PREFIX_ADDRESS, 16, 4, - desc, desc_bytes(desc), 1); + desc, DESC_BYTES(desc), 1); #endif return 0; } diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 69736b6f07ae..ead1041d20c1 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -13,25 +13,35 @@ #include "regs.h" #include "intern.h" #include "jr.h" -#include "desc_constr.h" +#include "flib/rta.h" #include "error.h" #include "ctrl.h" +enum rta_sec_era rta_sec_era; +EXPORT_SYMBOL(rta_sec_era); + +static const bool ps = (sizeof(dma_addr_t) == sizeof(u64)); + /* * Descriptor to instantiate RNG State Handle 0 in normal mode and * load the JDKEK, TDKEK and TDSK registers */ static void build_instantiation_desc(u32 *desc, int handle, int do_sk) { - u32 *jump_cmd, op_flags; - - init_job_desc(desc, 0); + struct program prg; + struct program *p = &prg; + LABEL(jump_cmd); + REFERENCE(pjump_cmd); - op_flags = OP_TYPE_CLASS1_ALG | OP_ALG_ALGSEL_RNG | - (handle << OP_ALG_AAI_SHIFT) | OP_ALG_AS_INIT; + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); /* INIT RNG in non-test mode */ - append_operation(desc, op_flags); + ALG_OPERATION(p, OP_ALG_ALGSEL_RNG, + (u16)(OP_ALG_AAI_RNG | + (handle << OP_ALG_AAI_RNG4_SH_SHIFT)), + OP_ALG_AS_INIT, 0, 0); if (!handle && do_sk) { /* @@ -39,33 +49,48 @@ static void build_instantiation_desc(u32 *desc, int handle, int do_sk) */ /* wait for done */ - jump_cmd = append_jump(desc, JUMP_CLASS_CLASS1); - set_jump_tgt_here(desc, jump_cmd); + pjump_cmd = JUMP(p, jump_cmd, LOCAL_JUMP, ALL_TRUE, CLASS1); + SET_LABEL(p, jump_cmd); /* * load 1 to clear written reg: * resets the done interrrupt and returns the RNG to idle. */ - append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW); + LOAD(p, CLRW_CLR_C1MODE, CLRW, 0, CAAM_CMD_SZ, IMMED); /* Initialize State Handle */ - append_operation(desc, OP_TYPE_CLASS1_ALG | OP_ALG_ALGSEL_RNG | - OP_ALG_AAI_RNG4_SK); + ALG_OPERATION(p, OP_ALG_ALGSEL_RNG, OP_ALG_AAI_RNG4_SK, + OP_ALG_AS_UPDATE, 0, 0); } - append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TYPE_HALT); + JUMP(p, 0, HALT, ALL_TRUE, CLASS1 | IMMED); + + PATCH_JUMP(p, pjump_cmd, jump_cmd); + + PROGRAM_FINALIZE(p); } /* Descriptor for deinstantiation of State Handle 0 of the RNG block. */ static void build_deinstantiation_desc(u32 *desc, int handle) { - init_job_desc(desc, 0); + struct program prg; + struct program *p = &prg; + + PROGRAM_CNTXT_INIT(p, desc, 0); + if (ps) + PROGRAM_SET_36BIT_ADDR(p); + + JOB_HDR(p, SHR_NEVER, 1, 0, 0); /* Uninstantiate State Handle 0 */ - append_operation(desc, OP_TYPE_CLASS1_ALG | OP_ALG_ALGSEL_RNG | - (handle << OP_ALG_AAI_SHIFT) | OP_ALG_AS_INITFINAL); + ALG_OPERATION(p, OP_ALG_ALGSEL_RNG, + (u16)(OP_ALG_AAI_RNG | + (handle << OP_ALG_AAI_RNG4_SH_SHIFT)), + OP_ALG_AS_INITFINAL, 0, 0); + + JUMP(p, 0, HALT, ALL_TRUE, CLASS1 | IMMED); - append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TYPE_HALT); + PROGRAM_FINALIZE(p); } /* @@ -112,7 +137,7 @@ static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc, return -ENODEV; } - for (i = 0; i < desc_len(desc); i++) + for (i = 0; i < DESC_LEN(desc); i++) wr_reg32(&topregs->deco.descbuf[i], *(desc + i)); flags = DECO_JQCR_WHL; @@ -120,7 +145,7 @@ static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc, * If the descriptor length is longer than 4 words, then the * FOUR bit in JRCTRL register must be set. */ - if (desc_len(desc) >= 4) + if (DESC_LEN(desc) >= 4) flags |= DECO_JQCR_FOUR; /* Instruct the DECO to execute it */ @@ -365,8 +390,9 @@ static void kick_trng(struct platform_device *pdev, int ent_delay) /** * caam_get_era() - Return the ERA of the SEC on SoC, based * on "sec-era" propery in the DTS. This property is updated by u-boot. + * Returns the ERA number or -ENOTSUPP if the ERA is unknown. **/ -int caam_get_era(void) +static int caam_get_era(void) { struct device_node *caam_node; @@ -381,7 +407,6 @@ int caam_get_era(void) return -ENOTSUPP; } -EXPORT_SYMBOL(caam_get_era); /* Probe routine for CAAM top (controller) level */ static int caam_probe(struct platform_device *pdev) @@ -429,7 +454,7 @@ static int caam_probe(struct platform_device *pdev) * long pointers in master configuration register */ setbits32(&topregs->ctrl.mcr, MCFGR_WDENABLE | - (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0)); + (ps ? MCFGR_LONG_PTR : 0)); /* * Read the Compile Time paramters and SCFGR to determine @@ -458,7 +483,7 @@ static int caam_probe(struct platform_device *pdev) JRSTART_JR1_START | JRSTART_JR2_START | JRSTART_JR3_START); - if (sizeof(dma_addr_t) == sizeof(u64)) + if (ps) if (of_device_is_compatible(nprop, "fsl,sec-v5.0")) dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40)); else @@ -582,8 +607,16 @@ static int caam_probe(struct platform_device *pdev) (u64)rd_reg32(&topregs->ctrl.perfmon.caam_id_ls); /* Report "alive" for developer to see */ - dev_info(dev, "device ID = 0x%016llx (Era %d)\n", caam_id, - caam_get_era()); + dev_info(dev, "device ID = 0x%016llx\n", caam_id); + ret = caam_get_era(); + if (ret >= 0) { + dev_info(dev, "Era %d\n", ret); + rta_set_sec_era(INTL_SEC_ERA(ret)); + } else { + dev_warn(dev, "Era property not found! Defaulting to era %d\n", + USER_SEC_ERA(DEFAULT_SEC_ERA)); + rta_set_sec_era(DEFAULT_SEC_ERA); + } dev_info(dev, "job rings = %d, qi = %d\n", ctrlpriv->total_jobrs, ctrlpriv->qi_present); diff --git a/drivers/crypto/caam/ctrl.h b/drivers/crypto/caam/ctrl.h index cac5402a46eb..93680a9290db 100644 --- a/drivers/crypto/caam/ctrl.h +++ b/drivers/crypto/caam/ctrl.h @@ -8,6 +8,6 @@ #define CTRL_H /* Prototypes for backend-level services exposed to APIs */ -int caam_get_era(void); +extern enum rta_sec_era rta_sec_era; #endif /* CTRL_H */ diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c index 871703c49d2c..e59e3d2d3b7c 100644 --- a/drivers/crypto/caam/key_gen.c +++ b/drivers/crypto/caam/key_gen.c @@ -7,7 +7,7 @@ #include "compat.h" #include "jr.h" #include "error.h" -#include "desc_constr.h" +#include "flib/desc/jobdesc.h" #include "key_gen.h" void split_key_done(struct device *dev, u32 *desc, u32 err, @@ -41,14 +41,14 @@ Split key generation----------------------------------------------- [06] 0x64260028 fifostr: class2 mdsplit-jdk len=40 @0xffe04000 */ -int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, - int split_key_pad_len, const u8 *key_in, u32 keylen, - u32 alg_op) +int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_pad_len, + const u8 *key_in, u32 keylen, u32 alg_op) { u32 *desc; struct split_key_result result; dma_addr_t dma_addr_in, dma_addr_out; int ret = 0; + static const bool ps = (sizeof(dma_addr_t) == sizeof(u64)); desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA); if (!desc) { @@ -56,8 +56,6 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, return -ENOMEM; } - init_job_desc(desc, 0); - dma_addr_in = dma_map_single(jrdev, (void *)key_in, keylen, DMA_TO_DEVICE); if (dma_mapping_error(jrdev, dma_addr_in)) { @@ -65,22 +63,7 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, kfree(desc); return -ENOMEM; } - append_key(desc, dma_addr_in, keylen, CLASS_2 | KEY_DEST_CLASS_REG); - - /* Sets MDHA up into an HMAC-INIT */ - append_operation(desc, alg_op | OP_ALG_DECRYPT | OP_ALG_AS_INIT); - - /* - * do a FIFO_LOAD of zero, this will trigger the internal key expansion - * into both pads inside MDHA - */ - append_fifo_load_as_imm(desc, NULL, 0, LDST_CLASS_2_CCB | - FIFOLD_TYPE_MSG | FIFOLD_TYPE_LAST2); - - /* - * FIFO_STORE with the explicit split-key content store - * (0x26 output type) - */ + dma_addr_out = dma_map_single(jrdev, key_out, split_key_pad_len, DMA_FROM_DEVICE); if (dma_mapping_error(jrdev, dma_addr_out)) { @@ -88,14 +71,16 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, kfree(desc); return -ENOMEM; } - append_fifo_store(desc, dma_addr_out, split_key_len, - LDST_CLASS_2_CCB | FIFOST_TYPE_SPLIT_KEK); + + /* keylen is expected to be less or equal block size (which is <=64) */ + cnstr_jobdesc_mdsplitkey(desc, ps, dma_addr_in, (u8)keylen, + alg_op & OP_ALG_ALGSEL_MASK, dma_addr_out); #ifdef DEBUG print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, key_in, keylen, 1); print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, DESC_BYTES(desc), 1); #endif result.err = 0; diff --git a/drivers/crypto/caam/key_gen.h b/drivers/crypto/caam/key_gen.h index c5588f6d8109..170d3672288b 100644 --- a/drivers/crypto/caam/key_gen.h +++ b/drivers/crypto/caam/key_gen.h @@ -12,6 +12,5 @@ struct split_key_result { void split_key_done(struct device *dev, u32 *desc, u32 err, void *context); -int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, - int split_key_pad_len, const u8 *key_in, u32 keylen, - u32 alg_op); +int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_pad_len, + const u8 *key_in, u32 keylen, u32 alg_op); -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html