crypto: nx - add offset to nx_build_sg_lists()

This patch includes one more parameter to nx_build_sg_lists() to skip
the given number of bytes from beginning of each sg list.

This is needed in order to implement the fixes for the AES modes to make
them able to process larger chunks of data.

Reviewed-by: Joy Latten <jmlatten@linux.vnet.ibm.com>
Signed-off-by: Marcelo Cerri <mhcerri@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

7 files changed, 14 insertions, 9 deletions

diff --git a/drivers/crypto/nx/nx-aes-cbc.c b/drivers/crypto/nx/nx-aes-cbc.c
index 7c0237dae02d..a9e76c6c37d8 100644
--- a/drivers/crypto/nx/nx-aes-cbc.c
+++ b/drivers/crypto/nx/nx-aes-cbc.c
@@ -85,7 +85,7 @@ static int cbc_aes_nx_crypt(struct blkcipher_desc *desc,
         else
                 NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT;
 
-        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes,
+        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0,
                                csbcpb->cpb.aes_cbc.iv);
         if (rc)
                 goto out;
diff --git a/drivers/crypto/nx/nx-aes-ccm.c b/drivers/crypto/nx/nx-aes-ccm.c
index 39d42245bc79..666a35b1181a 100644
--- a/drivers/crypto/nx/nx-aes-ccm.c
+++ b/drivers/crypto/nx/nx-aes-ccm.c
@@ -293,7 +293,7 @@ static int ccm_nx_decrypt(struct aead_request   *req,
         if (rc)
                 goto out;
 
-        rc = nx_build_sg_lists(nx_ctx, desc, req->dst, req->src, nbytes,
+        rc = nx_build_sg_lists(nx_ctx, desc, req->dst, req->src, nbytes, 0,
                                csbcpb->cpb.aes_ccm.iv_or_ctr);
         if (rc)
                 goto out;
@@ -339,7 +339,7 @@ static int ccm_nx_encrypt(struct aead_request   *req,
         if (rc)
                 goto out;
 
-        rc = nx_build_sg_lists(nx_ctx, desc, req->dst, req->src, nbytes,
+        rc = nx_build_sg_lists(nx_ctx, desc, req->dst, req->src, nbytes, 0,
                                csbcpb->cpb.aes_ccm.iv_or_ctr);
         if (rc)
                 goto out;
diff --git a/drivers/crypto/nx/nx-aes-ctr.c b/drivers/crypto/nx/nx-aes-ctr.c
index 762611b883cb..80dee8d58659 100644
--- a/drivers/crypto/nx/nx-aes-ctr.c
+++ b/drivers/crypto/nx/nx-aes-ctr.c
@@ -98,7 +98,7 @@ static int ctr_aes_nx_crypt(struct blkcipher_desc *desc,
                 goto out;
         }
 
-        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes,
+        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0,
                                csbcpb->cpb.aes_ctr.iv);
         if (rc)
                 goto out;
diff --git a/drivers/crypto/nx/nx-aes-ecb.c b/drivers/crypto/nx/nx-aes-ecb.c
index 77dbe084ba41..fe0d803ed233 100644
--- a/drivers/crypto/nx/nx-aes-ecb.c
+++ b/drivers/crypto/nx/nx-aes-ecb.c
@@ -85,7 +85,7 @@ static int ecb_aes_nx_crypt(struct blkcipher_desc *desc,
         else
                 NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT;
 
-        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, NULL);
+        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0, NULL);
         if (rc)
                 goto out;
 
diff --git a/drivers/crypto/nx/nx-aes-gcm.c b/drivers/crypto/nx/nx-aes-gcm.c
index 74feee10f943..c2d6f76e3677 100644
--- a/drivers/crypto/nx/nx-aes-gcm.c
+++ b/drivers/crypto/nx/nx-aes-gcm.c
@@ -226,7 +226,7 @@ static int gcm_aes_nx_crypt(struct aead_request *req, int enc)
 
         csbcpb->cpb.aes_gcm.bit_length_data = nbytes * 8;
 
-        rc = nx_build_sg_lists(nx_ctx, &desc, req->dst, req->src, nbytes,
+        rc = nx_build_sg_lists(nx_ctx, &desc, req->dst, req->src, nbytes, 0,
                                csbcpb->cpb.aes_gcm.iv_or_cnt);
         if (rc)
                 goto out;
diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index bdf4990f9758..5533fe31c90d 100644
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -211,6 +211,8 @@ struct nx_sg *nx_walk_and_build(struct nx_sg       *nx_dst,
  * @dst: destination scatterlist
  * @src: source scatterlist
  * @nbytes: length of data described in the scatterlists
+ * @offset: number of bytes to fast-forward past at the beginning of
+ *          scatterlists.
  * @iv: destination for the iv data, if the algorithm requires it
  *
  * This is common code shared by all the AES algorithms. It uses the block
@@ -222,6 +224,7 @@ int nx_build_sg_lists(struct nx_crypto_ctx  *nx_ctx,
                       struct scatterlist    *dst,
                       struct scatterlist    *src,
                       unsigned int           nbytes,
+                      unsigned int           offset,
                       u8                    *iv)
 {
         struct nx_sg *nx_insg = nx_ctx->in_sg;
@@ -230,8 +233,10 @@ int nx_build_sg_lists(struct nx_crypto_ctx  *nx_ctx,
         if (iv)
                 memcpy(iv, desc->info, AES_BLOCK_SIZE);
 
-        nx_insg = nx_walk_and_build(nx_insg, nx_ctx->ap->sglen, src, 0, nbytes);
-        nx_outsg = nx_walk_and_build(nx_outsg, nx_ctx->ap->sglen, dst, 0, nbytes);
+        nx_insg = nx_walk_and_build(nx_insg, nx_ctx->ap->sglen, src,
+                                    offset, nbytes);
+        nx_outsg = nx_walk_and_build(nx_outsg, nx_ctx->ap->sglen, dst,
+                                    offset, nbytes);
 
         /* these lengths should be negative, which will indicate to phyp that
          * the input and output parameters are scatterlists, not linear
diff --git a/drivers/crypto/nx/nx.h b/drivers/crypto/nx/nx.h
index 14bb97f1c339..befda07ca1da 100644
--- a/drivers/crypto/nx/nx.h
+++ b/drivers/crypto/nx/nx.h
@@ -156,7 +156,7 @@ int nx_hcall_sync(struct nx_crypto_ctx *ctx, struct vio_pfo_op *op,
 struct nx_sg *nx_build_sg_list(struct nx_sg *, u8 *, unsigned int, u32);
 int nx_build_sg_lists(struct nx_crypto_ctx *, struct blkcipher_desc *,
                       struct scatterlist *, struct scatterlist *, unsigned int,
-                      u8 *);
+                      unsigned int, u8 *);
 struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int,
                                 struct scatterlist *, unsigned int,
                                 unsigned int);