crypto: talitos - enhanced talitos_desc struct for SEC1

This patch enhances the talitos_desc struct with fields for SEC1.
SEC1 has only one header field, and has a 'next_desc' field in
addition.
This mixed descriptor will continue to fit SEC2, and for SEC1
we will recopy hdr value into hdr1 value in talitos_submit()

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h
index 61a14054aa39414664f637e10089ad4170a0651b..f078da1d387aead743b758916dfc3bb8f88ef046 100644 (file)
--- a/drivers/crypto/talitos.h
+++ b/drivers/crypto/talitos.h
@@ -37,9 +37,17 @@
 
 /* descriptor pointer entry */
 struct talitos_ptr {
-       __be16 len;     /* length */
-       u8 j_extent;    /* jump to sg link table and/or extent */
-       u8 eptr;        /* extended address */
+       union {
+               struct {                /* SEC2 format */
+                       __be16 len;     /* length */
+                       u8 j_extent;    /* jump to sg link table and/or extent*/
+                       u8 eptr;        /* extended address */
+               };
+               struct {                        /* SEC1 format */
+                       __be16 res;
+                       __be16 len1;    /* length */
+               };
+       };
        __be32 ptr;     /* address */
 };
 
@@ -53,8 +61,12 @@ static const struct talitos_ptr zero_entry = {
 /* descriptor */
 struct talitos_desc {
        __be32 hdr;                     /* header high bits */
-       __be32 hdr_lo;                  /* header low bits */
+       union {
+               __be32 hdr_lo;          /* header low bits */
+               __be32 hdr1;            /* header for SEC1 */
+       };
        struct talitos_ptr ptr[7];      /* ptr/len pair array */
+       __be32 next_desc;               /* next descriptor (SEC1) */
 };
 
 /**