From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Zhangfei Gao <zhangfei.gao@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Herbert Xu <herbert@gondor.apana.org.au>, <grant.likely@arm.com>,
jean-philippe <jean-philippe@linaro.org>,
"Jerome Glisse" <jglisse@redhat.com>,
<ilias.apalodimas@linaro.org>, <francois.ozog@linaro.org>,
<kenneth-lee-2012@foxmail.com>,
Wangzhou <wangzhou1@hisilicon.com>,
"haojian . zhuang" <haojian.zhuang@linaro.org>,
<guodong.xu@linaro.org>, <linux-accelerators@lists.ozlabs.org>,
<linux-kernel@vger.kernel.org>, <linux-crypto@vger.kernel.org>,
<iommu@lists.linux-foundation.org>
Subject: Re: [PATCH v10 3/4] crypto: hisilicon - Remove module_param uacce_mode
Date: Thu, 9 Jan 2020 17:40:39 +0000 [thread overview]
Message-ID: <20200109174039.0000338c@Huawei.com> (raw)
In-Reply-To: <1576465697-27946-4-git-send-email-zhangfei.gao@linaro.org>
On Mon, 16 Dec 2019 11:08:16 +0800
Zhangfei Gao <zhangfei.gao@linaro.org> wrote:
> Remove the module_param uacce_mode, which is not used currently.
>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> ---
> drivers/crypto/hisilicon/zip/zip_main.c | 31 ++++++-------------------------
> 1 file changed, 6 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
> index e1bab1a..93345f0 100644
> --- a/drivers/crypto/hisilicon/zip/zip_main.c
> +++ b/drivers/crypto/hisilicon/zip/zip_main.c
> @@ -297,9 +297,6 @@ static u32 pf_q_num = HZIP_PF_DEF_Q_NUM;
> module_param_cb(pf_q_num, &pf_q_num_ops, &pf_q_num, 0444);
> MODULE_PARM_DESC(pf_q_num, "Number of queues in PF(v1 1-4096, v2 1-1024)");
>
> -static int uacce_mode;
> -module_param(uacce_mode, int, 0);
> -
> static u32 vfs_num;
> module_param(vfs_num, uint, 0444);
> MODULE_PARM_DESC(vfs_num, "Number of VFs to enable(1-63)");
> @@ -791,6 +788,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> pci_set_drvdata(pdev, hisi_zip);
>
> qm = &hisi_zip->qm;
> + qm->use_dma_api = true;
> qm->pdev = pdev;
> qm->ver = rev_id;
>
> @@ -798,20 +796,6 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> qm->dev_name = hisi_zip_name;
> qm->fun_type = (pdev->device == PCI_DEVICE_ID_ZIP_PF) ? QM_HW_PF :
> QM_HW_VF;
> - switch (uacce_mode) {
> - case 0:
> - qm->use_dma_api = true;
> - break;
> - case 1:
> - qm->use_dma_api = false;
> - break;
> - case 2:
> - qm->use_dma_api = true;
> - break;
> - default:
> - return -EINVAL;
> - }
> -
> ret = hisi_qm_init(qm);
> if (ret) {
> dev_err(&pdev->dev, "Failed to init qm!\n");
> @@ -1010,12 +994,10 @@ static int __init hisi_zip_init(void)
> goto err_pci;
> }
>
> - if (uacce_mode == 0 || uacce_mode == 2) {
> - ret = hisi_zip_register_to_crypto();
> - if (ret < 0) {
> - pr_err("Failed to register driver to crypto.\n");
> - goto err_crypto;
> - }
> + ret = hisi_zip_register_to_crypto();
> + if (ret < 0) {
> + pr_err("Failed to register driver to crypto.\n");
> + goto err_crypto;
> }
>
> return 0;
> @@ -1030,8 +1012,7 @@ static int __init hisi_zip_init(void)
>
> static void __exit hisi_zip_exit(void)
> {
> - if (uacce_mode == 0 || uacce_mode == 2)
> - hisi_zip_unregister_from_crypto();
> + hisi_zip_unregister_from_crypto();
> pci_unregister_driver(&hisi_zip_pci_driver);
> hisi_zip_unregister_debugfs();
> }
next prev parent reply other threads:[~2020-01-09 17:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 3:08 [PATCH v10 0/4] Add uacce module for Accelerator Zhangfei Gao
2019-12-16 3:08 ` [PATCH v10 1/4] uacce: Add documents for uacce Zhangfei Gao
2019-12-16 3:08 ` [PATCH v10 2/4] uacce: add uacce driver Zhangfei Gao
2020-01-09 17:38 ` Jonathan Cameron
[not found] ` <8a9b535f-ce48-f991-ecd7-44fdf6ebdfe7@foxmail.com>
2020-01-10 10:10 ` Jonathan Cameron
2019-12-16 3:08 ` [PATCH v10 3/4] crypto: hisilicon - Remove module_param uacce_mode Zhangfei Gao
2020-01-09 17:40 ` Jonathan Cameron [this message]
2019-12-16 3:08 ` [PATCH v10 4/4] crypto: hisilicon - register zip engine to uacce Zhangfei Gao
2020-01-09 17:48 ` Jonathan Cameron
2020-01-10 7:07 ` zhangfei
2019-12-23 13:41 ` [PATCH v10 0/4] Add uacce module for Accelerator zhangfei
2020-01-08 16:47 ` Dave Jiang
2020-01-09 17:49 ` Jonathan Cameron
2020-01-10 7:03 ` zhangfei
2020-01-10 10:08 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200109174039.0000338c@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=arnd@arndb.de \
--cc=francois.ozog@linaro.org \
--cc=grant.likely@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=guodong.xu@linaro.org \
--cc=haojian.zhuang@linaro.org \
--cc=herbert@gondor.apana.org.au \
--cc=ilias.apalodimas@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=jglisse@redhat.com \
--cc=kenneth-lee-2012@foxmail.com \
--cc=linux-accelerators@lists.ozlabs.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wangzhou1@hisilicon.com \
--cc=zhangfei.gao@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).