crypto: iaa - Move compression CRC into request object

Rather than passing around a CRC between the functions, embed it
into the acomp_request context.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/intel/iaa/iaa_crypto_main.c
index 09d9589f2d681d523fc1b9e47484e0349750cec0..4240a2e3d375ac10d80ee5ad49b6dca07401542b 100644 (file)
--- a/drivers/crypto/intel/iaa/iaa_crypto_main.c
+++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c
@@ -1020,8 +1020,7 @@ static int iaa_remap_for_verify(struct device *dev, struct iaa_wq *iaa_wq,
 static int iaa_compress_verify(struct crypto_tfm *tfm, struct acomp_req *req,
                               struct idxd_wq *wq,
                               dma_addr_t src_addr, unsigned int slen,
-                              dma_addr_t dst_addr, unsigned int *dlen,
-                              u32 compression_crc);
+                              dma_addr_t dst_addr, unsigned int *dlen);
 
 static void iaa_desc_complete(struct idxd_desc *idxd_desc,
                              enum idxd_complete_type comp_type,
@@ -1087,10 +1086,10 @@ static void iaa_desc_complete(struct idxd_desc *idxd_desc,
        }
 
        if (ctx->compress && compression_ctx->verify_compress) {
+               u32 *compression_crc = acomp_request_ctx(ctx->req);
                dma_addr_t src_addr, dst_addr;
-               u32 compression_crc;
 
-               compression_crc = idxd_desc->iax_completion->crc;
+               *compression_crc = idxd_desc->iax_completion->crc;
 
                ret = iaa_remap_for_verify(dev, iaa_wq, ctx->req, &src_addr, &dst_addr);
                if (ret) {
@@ -1100,8 +1099,7 @@ static void iaa_desc_complete(struct idxd_desc *idxd_desc,
                }
 
                ret = iaa_compress_verify(ctx->tfm, ctx->req, iaa_wq->wq, src_addr,
-                                         ctx->req->slen, dst_addr, &ctx->req->dlen,
-                                         compression_crc);
+                                         ctx->req->slen, dst_addr, &ctx->req->dlen);
                if (ret) {
                        dev_dbg(dev, "%s: compress verify failed ret=%d\n", __func__, ret);
                        err = -EIO;
@@ -1130,11 +1128,11 @@ out:
 static int iaa_compress(struct crypto_tfm *tfm,        struct acomp_req *req,
                        struct idxd_wq *wq,
                        dma_addr_t src_addr, unsigned int slen,
-                       dma_addr_t dst_addr, unsigned int *dlen,
-                       u32 *compression_crc)
+                       dma_addr_t dst_addr, unsigned int *dlen)
 {
        struct iaa_device_compression_mode *active_compression_mode;
        struct iaa_compression_ctx *ctx = crypto_tfm_ctx(tfm);
+       u32 *compression_crc = acomp_request_ctx(req);
        struct iaa_device *iaa_device;
        struct idxd_desc *idxd_desc;
        struct iax_hw_desc *desc;
@@ -1282,11 +1280,11 @@ out:
 static int iaa_compress_verify(struct crypto_tfm *tfm, struct acomp_req *req,
                               struct idxd_wq *wq,
                               dma_addr_t src_addr, unsigned int slen,
-                              dma_addr_t dst_addr, unsigned int *dlen,
-                              u32 compression_crc)
+                              dma_addr_t dst_addr, unsigned int *dlen)
 {
        struct iaa_device_compression_mode *active_compression_mode;
        struct iaa_compression_ctx *ctx = crypto_tfm_ctx(tfm);
+       u32 *compression_crc = acomp_request_ctx(req);
        struct iaa_device *iaa_device;
        struct idxd_desc *idxd_desc;
        struct iax_hw_desc *desc;
@@ -1346,10 +1344,10 @@ static int iaa_compress_verify(struct crypto_tfm *tfm, struct acomp_req *req,
                goto err;
        }
 
-       if (compression_crc != idxd_desc->iax_completion->crc) {
+       if (*compression_crc != idxd_desc->iax_completion->crc) {
                ret = -EINVAL;
                dev_dbg(dev, "(verify) iaa comp/decomp crc mismatch:"
-                       " comp=0x%x, decomp=0x%x\n", compression_crc,
+                       " comp=0x%x, decomp=0x%x\n", *compression_crc,
                        idxd_desc->iax_completion->crc);
                print_hex_dump(KERN_INFO, "cmp-rec: ", DUMP_PREFIX_OFFSET,
                               8, 1, idxd_desc->iax_completion, 64, 0);
@@ -1496,7 +1494,6 @@ static int iaa_comp_acompress(struct acomp_req *req)
        dma_addr_t src_addr, dst_addr;
        int nr_sgs, cpu, ret = 0;
        struct iaa_wq *iaa_wq;
-       u32 compression_crc;
        struct idxd_wq *wq;
        struct device *dev;
 
@@ -1557,7 +1554,7 @@ static int iaa_comp_acompress(struct acomp_req *req)
                req->dst, req->dlen, sg_dma_len(req->dst));
 
        ret = iaa_compress(tfm, req, wq, src_addr, req->slen, dst_addr,
-                          &req->dlen, &compression_crc);
+                          &req->dlen);
        if (ret == -EINPROGRESS)
                return ret;
 
@@ -1569,7 +1566,7 @@ static int iaa_comp_acompress(struct acomp_req *req)
                }
 
                ret = iaa_compress_verify(tfm, req, wq, src_addr, req->slen,
-                                         dst_addr, &req->dlen, compression_crc);
+                                         dst_addr, &req->dlen);
                if (ret)
                        dev_dbg(dev, "asynchronous compress verification failed ret=%d\n", ret);
 
@@ -1694,6 +1691,7 @@ static struct acomp_alg iaa_acomp_fixed_deflate = {
        .init                   = iaa_comp_init_fixed,
        .compress               = iaa_comp_acompress,
        .decompress             = iaa_comp_adecompress,
+       .reqsize                = sizeof(u32),
        .base                   = {
                .cra_name               = "deflate",
                .cra_driver_name        = "deflate-iaa",