ENGR00215228-7: Externalize SG lists plus split-key generation

Split out inline scatter-gather list handlers into an external header,
and moved key generation into standalone source.

Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com>
Signed-off-by: Terry Lv <r65388@freescale.com>

diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c
new file mode 100644 (file)
index 0000000..8e8a1d7
--- /dev/null
+++ b/drivers/crypto/caam/key_gen.c
@@ -0,0 +1,122 @@
+/*
+ * CAAM/SEC 4.x functions for handling key-generation jobs
+ *
+ * Copyright (C) 2008-2012 Freescale Semiconductor, Inc.
+ *
+ */
+#include "compat.h"
+#include "jr.h"
+#include "error.h"
+#include "desc_constr.h"
+#include "key_gen.h"
+
+void split_key_done(struct device *dev, u32 *desc, u32 err,
+                          void *context)
+{
+       struct split_key_result *res = context;
+
+#ifdef DEBUG
+       dev_err(dev, "%s %d: err 0x%x\n", __func__, __LINE__, err);
+#endif
+
+       if (err) {
+               char tmp[CAAM_ERROR_STR_MAX];
+
+               dev_err(dev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
+       }
+
+       res->err = err;
+
+       complete(&res->completion);
+}
+EXPORT_SYMBOL(split_key_done);
+/*
+get a split ipad/opad key
+
+Split key generation-----------------------------------------------
+
+[00] 0xb0810008    jobdesc: stidx=1 share=never len=8
+[01] 0x04000014        key: class2->keyreg len=20
+                       @0xffe01000
+[03] 0x84410014  operation: cls2-op sha1 hmac init dec
+[04] 0x24940000     fifold: class2 msgdata-last2 len=0 imm
+[05] 0xa4000001       jump: class2 local all ->1 [06]
+[06] 0x64260028    fifostr: class2 mdsplit-jdk len=40
+                       @0xffe04000
+*/
+u32 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)
+{
+       u32 *desc;
+       struct split_key_result result;
+       dma_addr_t dma_addr_in, dma_addr_out;
+       int ret = 0;
+
+       desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);
+
+       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)) {
+               dev_err(jrdev, "unable to map key input memory\n");
+               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)) {
+               dev_err(jrdev, "unable to map key output memory\n");
+               kfree(desc);
+               return -ENOMEM;
+       }
+       append_fifo_store(desc, dma_addr_out, split_key_len,
+                         LDST_CLASS_2_CCB | FIFOST_TYPE_SPLIT_KEK);
+
+#ifdef DEBUG
+       print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",
+                      DUMP_PREFIX_ADDRESS, 16, 4, key_in, keylen, 1);
+       print_hex_dump(KERN_ERR, "jobdesc@"xstr(__LINE__)": ",
+                      DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), 1);
+#endif
+
+       result.err = 0;
+       init_completion(&result.completion);
+
+       ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);
+       if (!ret) {
+               /* in progress */
+               wait_for_completion_interruptible(&result.completion);
+               ret = result.err;
+#ifdef DEBUG
+               print_hex_dump(KERN_ERR, "ctx.key@"xstr(__LINE__)": ",
+                              DUMP_PREFIX_ADDRESS, 16, 4, key_out,
+                              split_key_pad_len, 1);
+#endif
+       }
+
+       dma_unmap_single(jrdev, dma_addr_out, split_key_pad_len,
+                        DMA_FROM_DEVICE);
+       dma_unmap_single(jrdev, dma_addr_in, keylen, DMA_TO_DEVICE);
+
+       kfree(desc);
+
+       return ret;
+}

diff --git a/drivers/crypto/caam/key_gen.h b/drivers/crypto/caam/key_gen.h
new file mode 100644 (file)
index 0000000..2306b32
--- /dev/null
+++ b/drivers/crypto/caam/key_gen.h
@@ -0,0 +1,17 @@
+/*
+ * CAAM/SEC 4.x definitions for handling key-generation jobs
+ *
+ * Copyright (C) 2008-2012 Freescale Semiconductor, Inc.
+ *
+ */
+
+struct split_key_result {
+       struct completion completion;
+       int err;
+};
+
+void split_key_done(struct device *dev, u32 *desc, u32 err, void *context);
+
+u32 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);

diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h
new file mode 100644 (file)
index 0000000..53499a2
--- /dev/null
+++ b/drivers/crypto/caam/sg_sw_sec4.h
@@ -0,0 +1,158 @@
+/*
+ * CAAM/SEC 4.x functions for using scatterlists in caam driver
+ *
+ * Copyright (C) 2008-2012 Freescale Semiconductor, Inc.
+ *
+ */
+
+struct sec4_sg_entry;
+
+/*
+ * convert single dma address to h/w link table format
+ */
+static inline void dma_to_sec4_sg_one(struct sec4_sg_entry *sec4_sg_ptr,
+                                     dma_addr_t dma, u32 len, u32 offset)
+{
+#ifndef CONFIG_64BIT
+       sec4_sg_ptr->reserved = 0;      /* ensure MSB half is zeroed */
+#endif
+       sec4_sg_ptr->ptr = dma;
+       sec4_sg_ptr->len = (len & SEC4_SG_LEN_MASK);
+       /* Does not add in buffer pool ID's at this time */
+       sec4_sg_ptr->bpid_offset = (offset & SEC4_SG_OFFS_MASK);
+#ifdef DEBUG
+       print_hex_dump(KERN_ERR, "sec4_sg_ptr@: ",
+                      DUMP_PREFIX_ADDRESS, 16, 4, sec4_sg_ptr,
+                      sizeof(struct sec4_sg_entry), 1);
+#endif
+}
+
+/*
+ * convert scatterlist to h/w link table format
+ * but does not have final bit; instead, returns last entry
+ */
+static inline struct sec4_sg_entry *
+sg_to_sec4_sg(struct scatterlist *sg, int sg_count,
+             struct sec4_sg_entry *sec4_sg_ptr, u32 offset)
+{
+       while (sg_count) {
+               dma_to_sec4_sg_one(sec4_sg_ptr, sg_dma_address(sg),
+                                  sg_dma_len(sg), offset);
+               sec4_sg_ptr++;
+               sg = scatterwalk_sg_next(sg);
+               sg_count--;
+       }
+       return sec4_sg_ptr - 1;
+}
+
+/*
+ * convert scatterlist to h/w link table format
+ * scatterlist must have been previously dma mapped
+ */
+static inline void sg_to_sec4_sg_last(struct scatterlist *sg, int sg_count,
+                                     struct sec4_sg_entry *sec4_sg_ptr,
+                                     u32 offset)
+{
+       sec4_sg_ptr = sg_to_sec4_sg(sg, sg_count, sec4_sg_ptr, offset);
+       sec4_sg_ptr->len |= SEC4_SG_LEN_FIN;
+}
+
+/* count number of elements in scatterlist */
+static inline int __sg_count(struct scatterlist *sg_list, int nbytes,
+                            bool *chained)
+{
+       struct scatterlist *sg = sg_list;
+       int sg_nents = 0;
+
+       while (nbytes > 0) {
+               sg_nents++;
+               nbytes -= sg->length;
+               if (!sg_is_last(sg) && (sg + 1)->length == 0)
+                       *chained = true;
+               sg = scatterwalk_sg_next(sg);
+       }
+
+       return sg_nents;
+}
+
+/* derive number of elements in scatterlist, but return 0 for 1 */
+static inline int sg_count(struct scatterlist *sg_list, int nbytes,
+                            bool *chained)
+{
+       int sg_nents = __sg_count(sg_list, nbytes, chained);
+
+       if (likely(sg_nents == 1))
+               return 0;
+
+       return sg_nents;
+}
+
+static int dma_map_sg_chained(struct device *dev, struct scatterlist *sg,
+                             unsigned int nents, enum dma_data_direction dir,
+                             bool chained)
+{
+       if (unlikely(chained)) {
+               int i;
+               for (i = 0; i < nents; i++) {
+                       dma_map_sg(dev, sg, 1, dir);
+                       sg = scatterwalk_sg_next(sg);
+               }
+       } else {
+               dma_map_sg(dev, sg, nents, dir);
+       }
+       return nents;
+}
+
+static int dma_unmap_sg_chained(struct device *dev, struct scatterlist *sg,
+                               unsigned int nents, enum dma_data_direction dir,
+                               bool chained)
+{
+       if (unlikely(chained)) {
+               int i;
+               for (i = 0; i < nents; i++) {
+                       dma_unmap_sg(dev, sg, 1, dir);
+                       sg = scatterwalk_sg_next(sg);
+               }
+       } else {
+               dma_unmap_sg(dev, sg, nents, dir);
+       }
+       return nents;
+}
+
+/* Copy from len bytes of sg to dest, starting from beginning */
+static inline void sg_copy(u8 *dest, struct scatterlist *sg, unsigned int len)
+{
+       struct scatterlist *current_sg = sg;
+       int cpy_index = 0, next_cpy_index = current_sg->length;
+
+       while (next_cpy_index < len) {
+               memcpy(dest + cpy_index, (u8 *) sg_virt(current_sg),
+                      current_sg->length);
+               current_sg = scatterwalk_sg_next(current_sg);
+               cpy_index = next_cpy_index;
+               next_cpy_index += current_sg->length;
+       }
+       if (cpy_index < len)
+               memcpy(dest + cpy_index, (u8 *) sg_virt(current_sg),
+                      len - cpy_index);
+}
+
+/* Copy sg data, from to_skip to end, to dest */
+static inline void sg_copy_part(u8 *dest, struct scatterlist *sg,
+                                     int to_skip, unsigned int end)
+{
+       struct scatterlist *current_sg = sg;
+       int sg_index, cpy_index;
+
+       sg_index = current_sg->length;
+       while (sg_index <= to_skip) {
+               current_sg = scatterwalk_sg_next(current_sg);
+               sg_index += current_sg->length;
+       }
+       cpy_index = sg_index - to_skip;
+       memcpy(dest, (u8 *) sg_virt(current_sg) +
+              current_sg->length - cpy_index, cpy_index);
+       current_sg = scatterwalk_sg_next(current_sg);
+       if (end - sg_index)
+               sg_copy(dest + cpy_index, current_sg, end - sg_index);
+}