From cefedb7b2b37542bb20090b4da770c525a25d02e Mon Sep 17 00:00:00 2001
From: Zhou Wang <wangzhou1@hisilicon.com>
Date: Wed, 24 Apr 2019 18:08:45 +0800
Subject: [PATCH] arm64: crypto/hisilicon/zip: notify uacce when zip controller
 reset

driver inclusion
category: bugfix
bugzilla: 13683
CVE: NA

-------------------------------------------------

crypto/hisilicon/zip: notify uacce when zip controller reset

Feature or Bugfix:Feature

Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
Reviewed-by: xuzaibo <xuzaibo@huawei.com>
Reviewed-by: fanghao <fanghao11@huawei.com>
Signed-off-by: Mingqiang Ling <lingmingqiang@huawei.com>
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/crypto/hisilicon/zip/zip_main.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index 519fba1d5e9a..4337a1e58529 100644
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -940,6 +940,11 @@ static int hisi_zip_controller_reset_prepare(struct hisi_zip *hisi_zip)
 		return ret;
 	}
 
+#ifdef CONFIG_CRYPTO_QM_UACCE
+	if (qm->use_uacce)
+		uacce_reset_prepare(&qm->uacce);
+#endif
+
 	return 0;
 }
 
@@ -1034,6 +1039,11 @@ static int hisi_zip_controller_reset_done(struct hisi_zip *hisi_zip)
 	/* Clear VF MSE bit */
 	hisi_zip_set_mse(hisi_zip, 1);
 
+#ifdef CONFIG_CRYPTO_QM_UACCE
+	if (qm->use_uacce)
+		uacce_reset_done(&qm->uacce);
+#endif
+
 	return 0;
 }
 
-- 
GitLab