diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
index faa57a5220f7fe89cffb68301ae67e1a57077876..99980890ae1dd708f48d26ad4c8264aa67afb704 100644
--- a/drivers/crypto/hisilicon/Kconfig
+++ b/drivers/crypto/hisilicon/Kconfig
@@ -43,18 +43,18 @@ config CRYPTO_DEV_HISI_HPRE
 	  Support for HiSilicon HIP09 HPRE engine.
 
 config CRYPTO_DEV_HISI_SEC2
-        tristate "Support for HISI SEC Driver"
-        depends on ARM64
-        select CRYPTO_DEV_HISI_QM
-        select CRYPTO_HISI_SGL
-        select CRYPTO_BLKCIPHER
-        select CRYPTO_ALGAPI
-        help
-          Support for HiSilicon HIP09 SEC Driver.
+	tristate "Support for HISI SEC Driver"
+	depends on ARM64
+	select CRYPTO_DEV_HISI_QM
+	select CRYPTO_HISI_SGL
+	select CRYPTO_BLKCIPHER
+	select CRYPTO_ALGAPI
+	help
+	  Support for HiSilicon HIP09 SEC Driver.
 
 config CRYPTO_DEV_HISI_RDE
-        tristate "Support for HISI RDE Driver"
-        depends on ARM64
-        select CRYPTO_DEV_HISI_QM
-        help
-          Support for HiSilicon HIP09 RDE Driver.
+	tristate "Support for HISI RDE Driver"
+	depends on ARM64
+	select CRYPTO_DEV_HISI_QM
+	help
+	  Support for HiSilicon HIP09 RDE Driver.
diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
index a9fdfe439d4365851a8dc2d3e9918fb3d60d19e0..7fbdc67dce9131ad1b6c56a7f0086601f165b50c 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
@@ -867,7 +867,8 @@ static int hpre_rsa_setkey_crt(struct hpre_ctx *ctx, struct rsa_key *rsa_key)
 
 	return 0;
 free_key:
-	memset(ctx->rsa.crt_prikey + hlf_ksz * _CRT_PRMS, '\0', hlf_ksz);
+	offset = hlf_ksz * _CRT_PRMS;
+	memset(ctx->rsa.crt_prikey + offset, '\0', hlf_ksz);
 	dma_free_coherent(dev, hlf_ksz * _CRT_PRMS, ctx->rsa.crt_prikey,
 			  ctx->rsa.dma_crt_prikey);
 	ctx->rsa.crt_prikey = NULL;
diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
index 0514f71312c94a4854bb550293e9e63186c6aac8..f9e36727572f369d18f2584604185f21702c397b 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_main.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
@@ -801,7 +801,7 @@ static int hpre_qm_pre_init(struct hisi_qm *qm, struct pci_dev *pdev)
 		qm->use_uacce = false;
 		break;
 	case UACCE_MODE_UACCE:
-#ifdef CONFIG_IOMMU_SVA2
+#ifdef CONFIG_IOMMU_SVA
 		qm->use_dma_api = true;
 		qm->use_sva = true;
 #else
@@ -1507,7 +1507,7 @@ static int __init hpre_init(void)
 		pr_err("hpre: can't register hisi hpre driver.\n");
 		goto fail_to_register_pci;
 	}
-#ifndef CONFIG_IOMMU_SVA2
+#ifndef CONFIG_IOMMU_SVA
 	if (uacce_mode == UACCE_MODE_UACCE)
 		return 0;
 #endif
@@ -1528,7 +1528,7 @@ static int __init hpre_init(void)
 
 static void __exit hpre_exit(void)
 {
-#ifndef CONFIG_IOMMU_SVA2
+#ifndef CONFIG_IOMMU_SVA
 	if (uacce_mode != UACCE_MODE_UACCE)
 		hpre_algs_unregister();
 #else
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 395a46b34ba53e4213687257f2997ef972650415..180f80886cc93a4fb96ca185fbd6fbcfe2431d87 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -173,9 +173,9 @@
 	(((hop_num) << QM_SQ_HOP_NUM_SHIFT)	| \
 	((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT)	| \
 	((buf_sz) << QM_SQ_BUF_SIZE_SHIFT)	| \
-	(ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
+	((u32)ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
 #define QM_MK_SQC_DW3_V2(sqe_sz) \
-	((QM_Q_DEPTH - 1) | (ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
+	((QM_Q_DEPTH - 1) | ((u32)ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
 
 #define INIT_QC_COMMON(qc, base, pasid) do {	\
 	(qc)->head = 0;				\
@@ -1171,7 +1171,6 @@ static struct hisi_qp *hisi_qm_create_qp_nolock(struct hisi_qm *qm,
 	qp_id = find_first_zero_bit(qm->qp_bitmap, qm->qp_num);
 	if (qp_id >= qm->qp_num) {
 		dev_info_ratelimited(&qm->pdev->dev, "QM all queues are busy!\n");
-
 		ret = -EBUSY;
 		goto err_free_qp;
 	}
diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index 9c2dfdfa6918b1ead7b9da33a24e337fc7dc82b9..752c687c757e79f2355d45910a70ffc313bdf6b3 100644
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -823,7 +823,7 @@ static int hisi_sec_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)
 		qm->use_uacce = false;
 		break;
 	case UACCE_MODE_UACCE:
-#ifdef CONFIG_IOMMU_SVA2
+#ifdef CONFIG_IOMMU_SVA
 		qm->use_dma_api = true;
 		qm->use_sva = true;
 #else
@@ -1516,7 +1516,7 @@ static int __init hisi_sec_init(void)
 		pr_err("Failed to register pci driver.\n");
 		goto err_pci;
 	}
-#ifndef CONFIG_IOMMU_SVA2
+#ifndef CONFIG_IOMMU_SVA
 	if (uacce_mode == UACCE_MODE_UACCE)
 		return 0;
 #endif
@@ -1546,7 +1546,7 @@ static int __init hisi_sec_init(void)
 
 static void __exit hisi_sec_exit(void)
 {
-#ifndef CONFIG_IOMMU_SVA2
+#ifndef CONFIG_IOMMU_SVA
 	if (uacce_mode != UACCE_MODE_UACCE)
 		hisi_sec_unregister_from_crypto();
 #else
diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h
index 05132a27a9d3de401961a8da15f7aadb0dbe52cc..f3584c53670e42e739918dd317d5e54a086c5ce3 100644
--- a/drivers/crypto/hisilicon/zip/zip.h
+++ b/drivers/crypto/hisilicon/zip/zip.h
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
-/* Copyright (c) 2018 HiSilicon Limited. */
 /*
  * Copyright (c) 2018-2019 HiSilicon Limited.
  *
diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index 49798056b1a23688f57f27ea254d3764c7990427..796b52c935df76c49ca934432490d3b0feaa0fb6 100644
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -779,7 +779,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 		qm->use_uacce = false;
 		break;
 	case UACCE_MODE_UACCE:
-#ifdef CONFIG_IOMMU_SVA2
+#ifdef CONFIG_IOMMU_SVA
 		qm->use_dma_api = true;
 		qm->use_sva = true;
 #else
@@ -1423,7 +1423,7 @@ static int __init hisi_zip_init(void)
 		goto err_pci;
 	}
 
-#ifndef CONFIG_IOMMU_SVA2
+#ifndef CONFIG_IOMMU_SVA
 	if (uacce_mode == UACCE_MODE_UACCE)
 		return 0;
 #endif
@@ -1446,7 +1446,7 @@ static int __init hisi_zip_init(void)
 
 static void __exit hisi_zip_exit(void)
 {
-#ifndef CONFIG_IOMMU_SVA2
+#ifndef CONFIG_IOMMU_SVA
 	if (uacce_mode != UACCE_MODE_UACCE)
 		hisi_zip_unregister_from_crypto();
 #else