crypto: hisilicon - use sgl API to get sgl dma addr and len

Use sgl API to get sgl dma addr and len, this will help to avoid compile
error in some platforms. So NEED_SG_DMA_LENGTH can be removed here, which
can only be selected by arch code.

Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
Suggested-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
index 1598468286be87110f95f588ee6d6cea1198182a..3e07ae2a96525063a2d3ca65fc341ffbdf347c5c 100644 (file)
--- a/drivers/crypto/hisilicon/Kconfig
+++ b/drivers/crypto/hisilicon/Kconfig
@@ -18,7 +18,6 @@ config CRYPTO_DEV_HISI_QM
        tristate
        depends on ARM64 || COMPILE_TEST
        depends on PCI && PCI_MSI
-       select NEED_SG_DMA_LENGTH
        help
          HiSilicon accelerator engines use a common queue management
          interface. Specific engine driver may use this module.

diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c
index bf72603f16cbce80a15e46e72ff1a408c69a8bd3..012023c347b1c7adf7fea767c0853a0e0f1cbebe 100644 (file)
--- a/drivers/crypto/hisilicon/sgl.c
+++ b/drivers/crypto/hisilicon/sgl.c
@@ -164,8 +164,8 @@ static struct hisi_acc_hw_sgl *acc_get_sgl(struct hisi_acc_sgl_pool *pool,
 static void sg_map_to_hw_sg(struct scatterlist *sgl,
                            struct acc_hw_sge *hw_sge)
 {
-       hw_sge->buf = sgl->dma_address;
-       hw_sge->len = cpu_to_le32(sgl->dma_length);
+       hw_sge->buf = sg_dma_address(sgl);
+       hw_sge->len = cpu_to_le32(sg_dma_len(sgl));
 }
 
 static void inc_hw_sgl_sge(struct hisi_acc_hw_sgl *hw_sgl)