crypto: caam/qi - fix AD length endianness in S/G entry
authorHoria Geantă <horia.geanta@nxp.com>
Mon, 10 Jul 2017 05:40:32 +0000 (08:40 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 18 Jul 2017 10:16:03 +0000 (18:16 +0800)
Associated data (AD) length is read by CAAM from an S/G entry
that is initially filled by the GPP.
Accordingly, AD length has to be stored in CAAM endianness.

Fixes: b189817cf789 ("crypto: caam/qi - add ablkcipher and authenc algorithms")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/caamalg_qi.c

index 85878f163cdda5ccd43a7282b68e3590e930a911..1fd83525deb46db5b3d7fc54af1ada149ee94e91 100644 (file)
@@ -399,6 +399,7 @@ badkey:
  * @iv_dma: dma address of iv for checking continuity and link table
  * @qm_sg_bytes: length of dma mapped h/w link table
  * @qm_sg_dma: bus physical mapped address of h/w link table
+ * @assoclen: associated data length, in CAAM endianness
  * @assoclen_dma: bus physical mapped address of req->assoclen
  * @drv_req: driver-specific request structure
  * @sgt: the h/w link table
@@ -409,6 +410,7 @@ struct aead_edesc {
        dma_addr_t iv_dma;
        int qm_sg_bytes;
        dma_addr_t qm_sg_dma;
+       unsigned int assoclen;
        dma_addr_t assoclen_dma;
        struct caam_drv_req drv_req;
 #define CAAM_QI_MAX_AEAD_SG                                            \
@@ -684,7 +686,8 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,
        edesc->drv_req.cbk = aead_done;
        edesc->drv_req.drv_ctx = drv_ctx;
 
-       edesc->assoclen_dma = dma_map_single(qidev, &req->assoclen, 4,
+       edesc->assoclen = cpu_to_caam32(req->assoclen);
+       edesc->assoclen_dma = dma_map_single(qidev, &edesc->assoclen, 4,
                                             DMA_TO_DEVICE);
        if (dma_mapping_error(qidev, edesc->assoclen_dma)) {
                dev_err(qidev, "unable to map assoclen\n");