crypto/fsl: SEC driver cleanup for 64 bit and endianness

The SEC driver code has been cleaned up to work for 64 bit
physical addresses and systems where endianess of SEC block
is different from the Core.
Changes:
1. Descriptor created on Core is modified as per SEC block
   endianness before the job is submitted.
2. The read/write of physical addresses to Job Rings will
   be depend on endianness of SEC block as 32 bit low and
   high part of the 64 bit address will vary.
3. The 32 bit low and high part of the 64 bit address in
   descriptor will vary depending on endianness of SEC.

Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index f9cae9144acd17e1fca6e7533c9f794c8b3700fe..2559ccda8c28ecfe80df26cc3c05034cae14d331 100644 (file)
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -36,6 +36,23 @@
                               LDST_SRCDST_WORD_DECOCTRL | \
                               (LDOFF_ENABLE_AUTO_NFIFO << LDST_OFFSET_SHIFT))
 
+#ifdef CONFIG_PHYS_64BIT
+union ptr_addr_t {
+       u64 m_whole;
+       struct {
+#ifdef CONFIG_SYS_FSL_SEC_LE
+               u32 low;
+               u32 high;
+#elif defined(CONFIG_SYS_FSL_SEC_BE)
+               u32 high;
+               u32 low;
+#else
+#error Neither CONFIG_SYS_FSL_SEC_LE nor CONFIG_SYS_FSL_SEC_BE is defined
+#endif
+       } m_halfs;
+};
+#endif
+
 static inline int desc_len(u32 *desc)
 {
        return *desc & HDR_DESCLEN_MASK;
@@ -65,7 +82,16 @@ static inline void append_ptr(u32 *desc, dma_addr_t ptr)
 {
        dma_addr_t *offset = (dma_addr_t *)desc_end(desc);
 
+#ifdef CONFIG_PHYS_64BIT
+       /* The Position of low and high part of 64 bit address
+        * will depend on the endianness of CAAM Block */
+       union ptr_addr_t ptr_addr;
+       ptr_addr.m_halfs.high = (u32)(ptr >> 32);
+       ptr_addr.m_halfs.low = (u32)ptr;
+       *offset = ptr_addr.m_whole;
+#else
        *offset = ptr;
+#endif
 
        (*desc) += CAAM_PTR_SZ / CAAM_CMD_SZ;
 }

diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index c298404f2526a1a448f3cc4098b287ee49513506..887e88c9ca7a2eeee28e535e65533421cba8f015 100644 (file)
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -84,7 +84,7 @@ static int caam_hash_update(void *hash_ctx, const void *buf,
                            enum caam_hash_algos caam_algo)
 {
        uint32_t final = 0;
-       dma_addr_t addr = virt_to_phys((void *)buf);
+       phys_addr_t addr = virt_to_phys((void *)buf);
        struct sha_ctx *ctx = hash_ctx;
 
        if (ctx->sg_num >= MAX_SG_32) {
@@ -93,11 +93,11 @@ static int caam_hash_update(void *hash_ctx, const void *buf,
        }
 
 #ifdef CONFIG_PHYS_64BIT
-       ctx->sg_tbl[ctx->sg_num].addr_hi = addr >> 32;
+       sec_out32(&ctx->sg_tbl[ctx->sg_num].addr_hi, (uint32_t)(addr >> 32));
 #else
-       ctx->sg_tbl[ctx->sg_num].addr_hi = 0x0;
+       sec_out32(&ctx->sg_tbl[ctx->sg_num].addr_hi, 0x0);
 #endif
-       ctx->sg_tbl[ctx->sg_num].addr_lo = addr;
+       sec_out32(&ctx->sg_tbl[ctx->sg_num].addr_lo, (uint32_t)addr);
 
        sec_out32(&ctx->sg_tbl[ctx->sg_num].len_flag,
                  (size & SG_ENTRY_LENGTH_MASK));

diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 17392c9813fbeed71cf36404e3fa379a96669cd3..f63eacb73eb0575b52a0eacf1e44b7d62b2dacb4 100644 (file)
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -11,6 +11,7 @@
 #include "fsl_sec.h"
 #include "jr.h"
 #include "jobdesc.h"
+#include "desc_constr.h"
 
 #define CIRC_CNT(head, tail, size)     (((head) - (tail)) & (size - 1))
 #define CIRC_SPACE(head, tail, size)   CIRC_CNT((tail), (head) + 1, (size))
@@ -154,19 +155,35 @@ static int jr_hw_reset(void)
 
 /* -1 --- error, can't enqueue -- no space available */
 static int jr_enqueue(uint32_t *desc_addr,
-              void (*callback)(uint32_t desc, uint32_t status, void *arg),
+              void (*callback)(uint32_t status, void *arg),
               void *arg)
 {
        struct jr_regs *regs = (struct jr_regs *)CONFIG_SYS_FSL_JR0_ADDR;
        int head = jr.head;
-       dma_addr_t desc_phys_addr = virt_to_phys(desc_addr);
+       uint32_t desc_word;
+       int length = desc_len(desc_addr);
+       int i;
+#ifdef CONFIG_PHYS_64BIT
+       uint32_t *addr_hi, *addr_lo;
+#endif
+
+       /* The descriptor must be submitted to SEC block as per endianness
+        * of the SEC Block.
+        * So, if the endianness of Core and SEC block is different, each word
+        * of the descriptor will be byte-swapped.
+        */
+       for (i = 0; i < length; i++) {
+               desc_word = desc_addr[i];
+               sec_out32((uint32_t *)&desc_addr[i], desc_word);
+       }
+
+       phys_addr_t desc_phys_addr = virt_to_phys(desc_addr);
 
        if (sec_in32(&regs->irsa) == 0 ||
            CIRC_SPACE(jr.head, jr.tail, jr.size) <= 0)
                return -1;
 
        jr.info[head].desc_phys_addr = desc_phys_addr;
-       jr.info[head].desc_addr = (uint32_t)desc_addr;
        jr.info[head].callback = (void *)callback;
        jr.info[head].arg = arg;
        jr.info[head].op_done = 0;
@@ -177,9 +194,29 @@ static int jr_enqueue(uint32_t *desc_addr,
                                        ARCH_DMA_MINALIGN);
        flush_dcache_range(start, end);
 
-       jr.input_ring[head] = desc_phys_addr;
+#ifdef CONFIG_PHYS_64BIT
+       /* Write the 64 bit Descriptor address on Input Ring.
+        * The 32 bit hign and low part of the address will
+        * depend on endianness of SEC block.
+        */
+#ifdef CONFIG_SYS_FSL_SEC_LE
+       addr_lo = (uint32_t *)(&jr.input_ring[head]);
+       addr_hi = (uint32_t *)(&jr.input_ring[head]) + 1;
+#elif defined(CONFIG_SYS_FSL_SEC_BE)
+       addr_hi = (uint32_t *)(&jr.input_ring[head]);
+       addr_lo = (uint32_t *)(&jr.input_ring[head]) + 1;
+#endif /* ifdef CONFIG_SYS_FSL_SEC_LE */
+
+       sec_out32(addr_hi, (uint32_t)(desc_phys_addr >> 32));
+       sec_out32(addr_lo, (uint32_t)(desc_phys_addr));
+
+#else
+       /* Write the 32 bit Descriptor address on Input Ring. */
+       sec_out32(&jr.input_ring[head], desc_phys_addr);
+#endif /* ifdef CONFIG_PHYS_64BIT */
+
        start = (unsigned long)&jr.input_ring[head] & ~(ARCH_DMA_MINALIGN - 1);
-       end = ALIGN(start + sizeof(dma_addr_t), ARCH_DMA_MINALIGN);
+       end = ALIGN(start + sizeof(phys_addr_t), ARCH_DMA_MINALIGN);
        flush_dcache_range(start, end);
 
        jr.head = (head + 1) & (jr.size - 1);
@@ -195,8 +232,13 @@ static int jr_dequeue(void)
        int head = jr.head;
        int tail = jr.tail;
        int idx, i, found;
-       void (*callback)(uint32_t desc, uint32_t status, void *arg);
+       void (*callback)(uint32_t status, void *arg);
        void *arg = NULL;
+#ifdef CONFIG_PHYS_64BIT
+       uint32_t *addr_hi, *addr_lo;
+#else
+       uint32_t *addr;
+#endif
 
        while (sec_in32(&regs->orsf) && CIRC_CNT(jr.head, jr.tail, jr.size)) {
                unsigned long start = (unsigned long)jr.output_ring &
@@ -208,14 +250,34 @@ static int jr_dequeue(void)
 
                found = 0;
 
-               dma_addr_t op_desc = jr.output_ring[jr.tail].desc;
-               uint32_t status = jr.output_ring[jr.tail].status;
-               uint32_t desc_virt;
+               phys_addr_t op_desc;
+       #ifdef CONFIG_PHYS_64BIT
+               /* Read the 64 bit Descriptor address from Output Ring.
+                * The 32 bit hign and low part of the address will
+                * depend on endianness of SEC block.
+                */
+       #ifdef CONFIG_SYS_FSL_SEC_LE
+               addr_lo = (uint32_t *)(&jr.output_ring[jr.tail].desc);
+               addr_hi = (uint32_t *)(&jr.output_ring[jr.tail].desc) + 1;
+       #elif defined(CONFIG_SYS_FSL_SEC_BE)
+               addr_hi = (uint32_t *)(&jr.output_ring[jr.tail].desc);
+               addr_lo = (uint32_t *)(&jr.output_ring[jr.tail].desc) + 1;
+       #endif /* ifdef CONFIG_SYS_FSL_SEC_LE */
+
+               op_desc = ((u64)sec_in32(addr_hi) << 32) |
+                         ((u64)sec_in32(addr_lo));
+
+       #else
+               /* Read the 32 bit Descriptor address from Output Ring. */
+               addr = (uint32_t *)&jr.output_ring[jr.tail].desc;
+               op_desc = sec_in32(addr);
+       #endif /* ifdef CONFIG_PHYS_64BIT */
+
+               uint32_t status = sec_in32(&jr.output_ring[jr.tail].status);
 
                for (i = 0; CIRC_CNT(head, tail + i, jr.size) >= 1; i++) {
                        idx = (tail + i) & (jr.size - 1);
                        if (op_desc == jr.info[idx].desc_phys_addr) {
-                               desc_virt = jr.info[idx].desc_addr;
                                found = 1;
                                break;
                        }
@@ -244,13 +306,13 @@ static int jr_dequeue(void)
                sec_out32(&regs->orjr, 1);
                jr.info[idx].op_done = 0;
 
-               callback(desc_virt, status, arg);
+               callback(status, arg);
        }
 
        return 0;
 }
 
-static void desc_done(uint32_t desc, uint32_t status, void *arg)
+static void desc_done(uint32_t status, void *arg)
 {
        struct result *x = arg;
        x->status = status;

diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h
index 152606008845aa2e327713c53b01d51d2587aa25..5899696e8adf8693013cf9caf3f4f55e1e27084e 100644 (file)
--- a/drivers/crypto/fsl/jr.h
+++ b/drivers/crypto/fsl/jr.h
@@ -37,14 +37,13 @@
 #define JQ_ENQ_ERR             -3
 
 struct op_ring {
-       dma_addr_t desc;
+       phys_addr_t desc;
        uint32_t status;
 } __packed;
 
 struct jr_info {
-       void (*callback)(dma_addr_t desc, uint32_t status, void *arg);
-       dma_addr_t desc_phys_addr;
-       uint32_t desc_addr;
+       void (*callback)(uint32_t status, void *arg);
+       phys_addr_t desc_phys_addr;
        uint32_t desc_len;
        uint32_t op_done;
        void *arg;

diff --git a/include/fsl_sec.h b/include/fsl_sec.h
index abc62da9928b1befb95e59d497b815ca1c0ec74b..2ddced34ab742de4c47b54217b99f56a3f486ab3 100644 (file)
--- a/include/fsl_sec.h
+++ b/include/fsl_sec.h
@@ -194,11 +194,9 @@ struct jr_regs {
 struct sg_entry {
 #if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_MX6)
        uint32_t addr_lo;       /* Memory Address - lo */
-       uint16_t addr_hi;       /* Memory Address of start of buffer - hi */
-       uint16_t reserved_zero;
+       uint32_t addr_hi;       /* Memory Address of start of buffer - hi */
 #else
-       uint16_t reserved_zero;
-       uint16_t addr_hi;       /* Memory Address of start of buffer - hi */
+       uint32_t addr_hi;       /* Memory Address of start of buffer - hi */
        uint32_t addr_lo;       /* Memory Address - lo */
 #endif