From 02ba6c3c8004f1f34bea37e4de1548c6edeaa810 Mon Sep 17 00:00:00 2001 From: Yu'an Wang Date: Thu, 20 Feb 2020 16:55:18 +0800 Subject: [PATCH] qm: fixup compilation dependency driver inclusion category: bugfix bugzilla: NA CVE: NA In this patch, we try to fixup compilation problem of __hisi_qm_start, when we close CONFIG_CRYPTO_QM_UACCE.If we have not defined this macro, we do not use para qm->reserve and qm->reserve_dma. Signed-off-by: Yu'an Wang Reviewed-by: Cheng Hu Signed-off-by: Yang Yingliang --- drivers/crypto/hisilicon/qm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index ec703836a683..8d1e76745711 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -2198,10 +2198,13 @@ static int __hisi_qm_start(struct hisi_qm *qm) QM_INIT_BUF(qm, aeqe, QM_Q_DEPTH); QM_INIT_BUF(qm, sqc, qm->qp_num); QM_INIT_BUF(qm, cqc, qm->qp_num); + +#ifdef CONFIG_CRYPTO_QM_UACCE /* get reserved dma memory */ qm->reserve = qm->qdma.va + off; qm->reserve_dma = qm->qdma.dma + off; off += PAGE_SIZE; +#endif ret = qm_eq_aeq_ctx_cfg(qm); if (ret) -- GitLab