crypto: talitos - move talitos structures to header file

This patch moves the talitos structure definitions from c file to its
header file so that the same can be shared on need basis.

Signed-off-by: Sandeep Malik <Sandeep.Malik@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 921039e..bb3e63f 100644 (file)
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -53,117 +53,6 @@
 
 #include "talitos.h"
 
-#define TALITOS_TIMEOUT 100000
-#define TALITOS_MAX_DATA_LEN 65535
-
-#define DESC_TYPE(desc_hdr) ((be32_to_cpu(desc_hdr) >> 3) & 0x1f)
-#define PRIMARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 28) & 0xf)
-#define SECONDARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 16) & 0xf)
-
-/* descriptor pointer entry */
-struct talitos_ptr {
-       __be16 len;     /* length */
-       u8 j_extent;    /* jump to sg link table and/or extent */
-       u8 eptr;        /* extended address */
-       __be32 ptr;     /* address */
-};
-
-static const struct talitos_ptr zero_entry = {
-       .len = 0,
-       .j_extent = 0,
-       .eptr = 0,
-       .ptr = 0
-};
-
-/* descriptor */
-struct talitos_desc {
-       __be32 hdr;                     /* header high bits */
-       __be32 hdr_lo;                  /* header low bits */
-       struct talitos_ptr ptr[7];      /* ptr/len pair array */
-};
-
-/**
- * talitos_request - descriptor submission request
- * @desc: descriptor pointer (kernel virtual)
- * @dma_desc: descriptor's physical bus address
- * @callback: whom to call when descriptor processing is done
- * @context: caller context (optional)
- */
-struct talitos_request {
-       struct talitos_desc *desc;
-       dma_addr_t dma_desc;
-       void (*callback) (struct device *dev, struct talitos_desc *desc,
-                         void *context, int error);
-       void *context;
-};
-
-/* per-channel fifo management */
-struct talitos_channel {
-       void __iomem *reg;
-
-       /* request fifo */
-       struct talitos_request *fifo;
-
-       /* number of requests pending in channel h/w fifo */
-       atomic_t submit_count ____cacheline_aligned;
-
-       /* request submission (head) lock */
-       spinlock_t head_lock ____cacheline_aligned;
-       /* index to next free descriptor request */
-       int head;
-
-       /* request release (tail) lock */
-       spinlock_t tail_lock ____cacheline_aligned;
-       /* index to next in-progress/done descriptor request */
-       int tail;
-};
-
-struct talitos_private {
-       struct device *dev;
-       struct platform_device *ofdev;
-       void __iomem *reg;
-       int irq[2];
-
-       /* SEC global registers lock  */
-       spinlock_t reg_lock ____cacheline_aligned;
-
-       /* SEC version geometry (from device tree node) */
-       unsigned int num_channels;
-       unsigned int chfifo_len;
-       unsigned int exec_units;
-       unsigned int desc_types;
-
-       /* SEC Compatibility info */
-       unsigned long features;
-
-       /*
-        * length of the request fifo
-        * fifo_len is chfifo_len rounded up to next power of 2
-        * so we can use bitwise ops to wrap
-        */
-       unsigned int fifo_len;
-
-       struct talitos_channel *chan;
-
-       /* next channel to be assigned next incoming descriptor */
-       atomic_t last_chan ____cacheline_aligned;
-
-       /* request callback tasklet */
-       struct tasklet_struct done_task[2];
-
-       /* list of registered algorithms */
-       struct list_head alg_list;
-
-       /* hwrng device */
-       struct hwrng rng;
-};
-
-/* .features flag */
-#define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001
-#define TALITOS_FTR_HW_AUTH_CHECK 0x00000002
-#define TALITOS_FTR_SHA224_HWINIT 0x00000004
-#define TALITOS_FTR_HMAC_OK 0x00000008
-
 static void to_talitos_ptr(struct talitos_ptr *talitos_ptr, dma_addr_t dma_addr)
 {
        talitos_ptr->ptr = cpu_to_be32(lower_32_bits(dma_addr));

diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h
index 3c17395..9835e3a 100644 (file)
--- a/drivers/crypto/talitos.h
+++ b/drivers/crypto/talitos.h
@@ -28,6 +28,117 @@
  *
  */
 
+#define TALITOS_TIMEOUT 100000
+#define TALITOS_MAX_DATA_LEN 65535
+
+#define DESC_TYPE(desc_hdr) ((be32_to_cpu(desc_hdr) >> 3) & 0x1f)
+#define PRIMARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 28) & 0xf)
+#define SECONDARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 16) & 0xf)
+
+/* descriptor pointer entry */
+struct talitos_ptr {
+       __be16 len;     /* length */
+       u8 j_extent;    /* jump to sg link table and/or extent */
+       u8 eptr;        /* extended address */
+       __be32 ptr;     /* address */
+};
+
+static const struct talitos_ptr zero_entry = {
+       .len = 0,
+       .j_extent = 0,
+       .eptr = 0,
+       .ptr = 0
+};
+
+/* descriptor */
+struct talitos_desc {
+       __be32 hdr;                     /* header high bits */
+       __be32 hdr_lo;                  /* header low bits */
+       struct talitos_ptr ptr[7];      /* ptr/len pair array */
+};
+
+/**
+ * talitos_request - descriptor submission request
+ * @desc: descriptor pointer (kernel virtual)
+ * @dma_desc: descriptor's physical bus address
+ * @callback: whom to call when descriptor processing is done
+ * @context: caller context (optional)
+ */
+struct talitos_request {
+       struct talitos_desc *desc;
+       dma_addr_t dma_desc;
+       void (*callback) (struct device *dev, struct talitos_desc *desc,
+                         void *context, int error);
+       void *context;
+};
+
+/* per-channel fifo management */
+struct talitos_channel {
+       void __iomem *reg;
+
+       /* request fifo */
+       struct talitos_request *fifo;
+
+       /* number of requests pending in channel h/w fifo */
+       atomic_t submit_count ____cacheline_aligned;
+
+       /* request submission (head) lock */
+       spinlock_t head_lock ____cacheline_aligned;
+       /* index to next free descriptor request */
+       int head;
+
+       /* request release (tail) lock */
+       spinlock_t tail_lock ____cacheline_aligned;
+       /* index to next in-progress/done descriptor request */
+       int tail;
+};
+
+struct talitos_private {
+       struct device *dev;
+       struct platform_device *ofdev;
+       void __iomem *reg;
+       int irq[2];
+
+       /* SEC global registers lock  */
+       spinlock_t reg_lock ____cacheline_aligned;
+
+       /* SEC version geometry (from device tree node) */
+       unsigned int num_channels;
+       unsigned int chfifo_len;
+       unsigned int exec_units;
+       unsigned int desc_types;
+
+       /* SEC Compatibility info */
+       unsigned long features;
+
+       /*
+        * length of the request fifo
+        * fifo_len is chfifo_len rounded up to next power of 2
+        * so we can use bitwise ops to wrap
+        */
+       unsigned int fifo_len;
+
+       struct talitos_channel *chan;
+
+       /* next channel to be assigned next incoming descriptor */
+       atomic_t last_chan ____cacheline_aligned;
+
+       /* request callback tasklet */
+       struct tasklet_struct done_task[2];
+
+       /* list of registered algorithms */
+       struct list_head alg_list;
+
+       /* hwrng device */
+       struct hwrng rng;
+};
+
+/* .features flag */
+#define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001
+#define TALITOS_FTR_HW_AUTH_CHECK 0x00000002
+#define TALITOS_FTR_SHA224_HWINIT 0x00000004
+#define TALITOS_FTR_HMAC_OK 0x00000008
+
 /*
  * TALITOS_xxx_LO addresses point to the low data bits (32-63) of the register
  */