From 2ce2c67a381283858a82f9db64cc336138af02ac Mon Sep 17 00:00:00 2001 From: lingmingqiang Date: Thu, 11 Jul 2019 14:41:31 +0800 Subject: [PATCH] ACC: crypto/zip/hpre: Notify uacce before doing FLR driver inclusion category: bugfix bugzilla: NA CVE: NA This patch adds uacce_reset_prepare before doing zip and hpre FLR and uacce_reset_done after zip and hpre FLR. Signed-off-by: Zhou Wang Reviewed-by: fanghao Reviewed-by: xuzaibo Signed-off-by: lingmingqiang Signed-off-by: Yang Yingliang --- drivers/crypto/hisilicon/hpre/hpre_main.c | 11 +++++++++++ drivers/crypto/hisilicon/zip/zip_main.c | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c index 19ccdfcfd87a..95ab6ae62b53 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_main.c +++ b/drivers/crypto/hisilicon/hpre/hpre_main.c @@ -1190,6 +1190,11 @@ static void hpre_reset_prepare(struct pci_dev *pdev) return; } +#ifdef CONFIG_CRYPTO_QM_UACCE + if (qm->use_uacce) + uacce_reset_prepare(&qm->uacce); +#endif + dev_info(dev, "FLR resetting...\n"); } @@ -1225,6 +1230,12 @@ static void hpre_reset_done(struct pci_dev *pdev) } } } + +#ifdef CONFIG_CRYPTO_QM_UACCE + if (qm->use_uacce) + uacce_reset_done(&qm->uacce); +#endif + dev_info(dev, "FLR reset complete\n"); } diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c index 81c9a262ee89..a8e06d7f98ec 100644 --- a/drivers/crypto/hisilicon/zip/zip_main.c +++ b/drivers/crypto/hisilicon/zip/zip_main.c @@ -1206,6 +1206,11 @@ static void hisi_zip_reset_prepare(struct pci_dev *pdev) hisi_zip_vf_flr_reset_prepare(pdev); +#ifdef CONFIG_CRYPTO_QM_UACCE + if (qm->use_uacce) + uacce_reset_prepare(&qm->uacce); +#endif + dev_info(dev, "FLR resetting...\n"); } @@ -1252,6 +1257,10 @@ static void hisi_zip_reset_done(struct pci_dev *pdev) hisi_zip_vf_flr_reset_done(pdev); +#ifdef CONFIG_CRYPTO_QM_UACCE + if (qm->use_uacce) + uacce_reset_done(&qm->uacce); +#endif dev_info(dev, "FLR reset complete\n"); } -- GitLab