crypto: chelsio - Fix src buffer dma length

ulptx header cannot have length > 64k. Adjust length accordingly.

Signed-off-by: Harsh Jain <harsh@chelsio.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 2bef6182b378871e1875ef540a2bb17a27487dd8..bc70f4f4e601ed2c6ca1a36126bc2676f05c6dfd 100644 (file)
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -662,7 +662,7 @@ static int chcr_sg_ent_in_wr(struct scatterlist *src,
 {
        int srclen = 0, dstlen = 0;
        int srcsg = minsg, dstsg = minsg;
-       int offset = 0, less;
+       int offset = 0, soffset = 0, less, sless = 0;
 
        if (sg_dma_len(src) == srcskip) {
                src = sg_next(src);
@@ -676,7 +676,9 @@ static int chcr_sg_ent_in_wr(struct scatterlist *src,
 
        while (src && dst &&
               space > (sgl_ent_len[srcsg + 1] + dsgl_ent_len[dstsg])) {
-               srclen += (sg_dma_len(src) - srcskip);
+               sless = min_t(unsigned int, sg_dma_len(src) - srcskip - soffset,
+                               CHCR_SRC_SG_SIZE);
+               srclen += sless;
                srcsg++;
                offset = 0;
                while (dst && ((dstsg + 1) <= MAX_DSGL_ENT) &&
@@ -687,15 +689,20 @@ static int chcr_sg_ent_in_wr(struct scatterlist *src,
                                     dstskip, CHCR_DST_SG_SIZE);
                        dstlen += less;
                        offset += less;
-                       if (offset == sg_dma_len(dst)) {
+                       if ((offset + dstskip) == sg_dma_len(dst)) {
                                dst = sg_next(dst);
                                offset = 0;
                        }
                        dstsg++;
                        dstskip = 0;
                }
-               src = sg_next(src);
-               srcskip = 0;
+               soffset += sless;
+               if ((soffset + srcskip) == sg_dma_len(src)) {
+                       src = sg_next(src);
+                       srcskip = 0;
+                       soffset = 0;
+               }
+
        }
        return min(srclen, dstlen);
 }