crypto: caam - link_tbl rename

- rename scatterlist and link_tbl functions
- link_tbl changed to sec4_sg
- sg_to_link_tbl_one changed to dma_to_sec4_sg_one,
  since no scatterlist is use

Signed-off-by: Yuan Kang <Yuan.Kang@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

3 files changed, 137 insertions, 137 deletions

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index ea0295d137a7..5ab480a12b51 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -51,7 +51,7 @@
 #include "desc_constr.h"
 #include "jr.h"
 #include "error.h"
-#include "sg_link_tbl.h"
+#include "sg_sw_sec4.h"
 #include "key_gen.h"
 
 /*
@@ -658,8 +658,8 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
  * @dst_nents: number of segments in output scatterlist
  * @iv_dma: dma address of iv for checking continuity and link table
  * @desc: h/w descriptor (variable length; must not exceed MAX_CAAM_DESCSIZE)
- * @link_tbl_bytes: length of dma mapped link_tbl space
- * @link_tbl_dma: bus physical mapped address of h/w link table
+ * @sec4_sg_bytes: length of dma mapped sec4_sg space
+ * @sec4_sg_dma: bus physical mapped address of h/w link table
  * @hw_desc: the h/w job descriptor followed by any referenced link tables
  */
 struct aead_edesc {
@@ -667,9 +667,9 @@ struct aead_edesc {
         int src_nents;
         int dst_nents;
         dma_addr_t iv_dma;
-        int link_tbl_bytes;
-        dma_addr_t link_tbl_dma;
-        struct link_tbl_entry *link_tbl;
+        int sec4_sg_bytes;
+        dma_addr_t sec4_sg_dma;
+        struct sec4_sg_entry *sec4_sg;
         u32 hw_desc[0];
 };
 
@@ -679,24 +679,24 @@ struct aead_edesc {
  * @dst_nents: number of segments in output scatterlist
  * @iv_dma: dma address of iv for checking continuity and link table
  * @desc: h/w descriptor (variable length; must not exceed MAX_CAAM_DESCSIZE)
- * @link_tbl_bytes: length of dma mapped link_tbl space
- * @link_tbl_dma: bus physical mapped address of h/w link table
+ * @sec4_sg_bytes: length of dma mapped sec4_sg space
+ * @sec4_sg_dma: bus physical mapped address of h/w link table
  * @hw_desc: the h/w job descriptor followed by any referenced link tables
  */
 struct ablkcipher_edesc {
         int src_nents;
         int dst_nents;
         dma_addr_t iv_dma;
-        int link_tbl_bytes;
-        dma_addr_t link_tbl_dma;
-        struct link_tbl_entry *link_tbl;
+        int sec4_sg_bytes;
+        dma_addr_t sec4_sg_dma;
+        struct sec4_sg_entry *sec4_sg;
         u32 hw_desc[0];
 };
 
 static void caam_unmap(struct device *dev, struct scatterlist *src,
                        struct scatterlist *dst, int src_nents, int dst_nents,
-                       dma_addr_t iv_dma, int ivsize, dma_addr_t link_tbl_dma,
-                       int link_tbl_bytes)
+                       dma_addr_t iv_dma, int ivsize, dma_addr_t sec4_sg_dma,
+                       int sec4_sg_bytes)
 {
         if (unlikely(dst != src)) {
                 dma_unmap_sg(dev, src, src_nents, DMA_TO_DEVICE);
@@ -707,8 +707,8 @@ static void caam_unmap(struct device *dev, struct scatterlist *src,
 
         if (iv_dma)
                 dma_unmap_single(dev, iv_dma, ivsize, DMA_TO_DEVICE);
-        if (link_tbl_bytes)
-                dma_unmap_single(dev, link_tbl_dma, link_tbl_bytes,
+        if (sec4_sg_bytes)
+                dma_unmap_single(dev, sec4_sg_dma, sec4_sg_bytes,
                                  DMA_TO_DEVICE);
 }
 
@@ -723,8 +723,8 @@ static void aead_unmap(struct device *dev,
 
         caam_unmap(dev, req->src, req->dst,
                    edesc->src_nents, edesc->dst_nents,
-                   edesc->iv_dma, ivsize, edesc->link_tbl_dma,
-                   edesc->link_tbl_bytes);
+                   edesc->iv_dma, ivsize, edesc->sec4_sg_dma,
+                   edesc->sec4_sg_bytes);
 }
 
 static void ablkcipher_unmap(struct device *dev,
@@ -736,8 +736,8 @@ static void ablkcipher_unmap(struct device *dev,
 
         caam_unmap(dev, req->src, req->dst,
                    edesc->src_nents, edesc->dst_nents,
-                   edesc->iv_dma, ivsize, edesc->link_tbl_dma,
-                   edesc->link_tbl_bytes);
+                   edesc->iv_dma, ivsize, edesc->sec4_sg_dma,
+                   edesc->sec4_sg_bytes);
 }
 
 static void aead_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
@@ -828,7 +828,7 @@ static void aead_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
                        sizeof(struct iphdr) + req->assoclen +
                        ((req->cryptlen > 1500) ? 1500 : req->cryptlen) +
                        ctx->authsize + 36, 1);
-        if (!err && edesc->link_tbl_bytes) {
+        if (!err && edesc->sec4_sg_bytes) {
                 struct scatterlist *sg = sg_last(req->src, edesc->src_nents);
                 print_hex_dump(KERN_ERR, "sglastout@"xstr(__LINE__)": ",
                                DUMP_PREFIX_ADDRESS, 16, 4, sg_virt(sg),
@@ -927,7 +927,7 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr,
         u32 *desc = edesc->hw_desc;
         u32 out_options = 0, in_options;
         dma_addr_t dst_dma, src_dma;
-        int len, link_tbl_index = 0;
+        int len, sec4_sg_index = 0;
 
 #ifdef DEBUG
         debug("assoclen %d cryptlen %d authsize %d\n",
@@ -953,9 +953,9 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr,
                 src_dma = sg_dma_address(req->assoc);
                 in_options = 0;
         } else {
-                src_dma = edesc->link_tbl_dma;
-                link_tbl_index += (edesc->assoc_nents ? : 1) + 1 +
-                                  (edesc->src_nents ? : 1);
+                src_dma = edesc->sec4_sg_dma;
+                sec4_sg_index += (edesc->assoc_nents ? : 1) + 1 +
+                                 (edesc->src_nents ? : 1);
                 in_options = LDST_SGF;
         }
         if (encrypt)
@@ -969,7 +969,7 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr,
                 if (all_contig) {
                         dst_dma = sg_dma_address(req->src);
                 } else {
-                        dst_dma = src_dma + sizeof(struct link_tbl_entry) *
+                        dst_dma = src_dma + sizeof(struct sec4_sg_entry) *
                                   ((edesc->assoc_nents ? : 1) + 1);
                         out_options = LDST_SGF;
                 }
@@ -977,9 +977,9 @@ static void init_aead_job(u32 *sh_desc, dma_addr_t ptr,
                 if (!edesc->dst_nents) {
                         dst_dma = sg_dma_address(req->dst);
                 } else {
-                        dst_dma = edesc->link_tbl_dma +
+                        dst_dma = edesc->sec4_sg_dma +