From patchwork Mon Dec 16 03:08:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 181638 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp3799545ile; Sun, 15 Dec 2019 19:09:34 -0800 (PST) X-Google-Smtp-Source: APXvYqz2yocGJwxXK9OPKPMOqJAnrd0Qh/NadGrOafMWPne8TTwz/6pV1maW1xlPcB0WTv0rGs5a X-Received: by 2002:a05:6830:120c:: with SMTP id r12mr30215734otp.327.1576465774473; Sun, 15 Dec 2019 19:09:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576465774; cv=none; d=google.com; s=arc-20160816; b=L7+GIgfkyeTufSXmLgX7biIbN5kq6pD5kZbC4UIGFszJsItqAT0gfq6d0QCgT0w4MW IN0S3Q05N49x6IT5KiWI5siQ2Dk/YlcUu6FWxdClbIX5Tx44QwQd8BjZO19fY/PfVdWH zLVKdSWIAuO8DQinNUnCazP5Ct86r8Buckyvq5SwblKHOrbFNBZ4srcM/p01sE48KqvC 92y7s4d1ay8aAvUiQdNC8g+FoxH1sFyGgZHl/YT9MGrqkbrxWqZLYkD5C/kT1EhHvAt2 xO5k1/cFx0qn6IWPCNM0Eo/WpZppY+E3Ay3dL21kXJq4LHdtvcdp0ejgdgDDxXdgDGCX R+Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=W9XtgUwCaqLhMYMb2ALmzrvWt2lsT7N00PF81eXUGSY=; b=UNy1plWzpZH7SVacs4Nt4n3xk6WhDyRhwIiI4EWluk2LgU0O2SwBBLmOfKYw4t15SL xOUrY5xb4Lgha8tqvCAtTsSvUSe9yX5tXQjUnciKDwvuIUZFwObqag0Cs8n6PIm3IDqR 1T2ykBZWRnjvDWHW8OuwWC+SrMcc+zXiO7GYvB9KAXoyxUK3D5WjKahJrh9uHjvsaC7/ CRKAgx4Y/vcso4dAopN1Xi55d4oTE3C0sbnrOdakeqcbTkjkgkW4d/6AkltAAsgiGLIu MvwdM7KgUpyyVpC+4WQc55oBZNNdOjWk16VRPO8lIuuoZ2I/+TsoV+pL/gBUuhCq5+hr +HQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d4C45TMh; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m82si9603000oig.129.2019.12.15.19.09.34; Sun, 15 Dec 2019 19:09:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d4C45TMh; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726560AbfLPDJd (ORCPT + 3 others); Sun, 15 Dec 2019 22:09:33 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:42579 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726551AbfLPDJd (ORCPT ); Sun, 15 Dec 2019 22:09:33 -0500 Received: by mail-pf1-f196.google.com with SMTP id 4so4775487pfz.9 for ; Sun, 15 Dec 2019 19:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W9XtgUwCaqLhMYMb2ALmzrvWt2lsT7N00PF81eXUGSY=; b=d4C45TMhLG17otkNIqcQIV7myR2FtJM/oxZV8H1jZ8G04hESxsdbJdsUP8hGHY8/Gf jghQRrKOidpVDRa71k7UJo+l0aZ4HJ7b5WrAzGsTk5cRD1h3BubA1I+J5rytAGtG3b59 m/kyp6LOdgYQsuxMDuQ+NJkEvyGSTNVLngOhtAokUSTFUdXetMIgcFr3FNzCFF2oJNpP jm3XpW4gTy+sitnHuEgFmEQ61tmyzqeuJotRRLWTn/6mSKI+jXcVPFTagB08Q2jKbkOI 5P1go0kcwaf6IrhKIxol3dskN4rl37kp4uOwoRH0eWY6gdy2XK6FBeWCqQDckqz0HM9L CKWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W9XtgUwCaqLhMYMb2ALmzrvWt2lsT7N00PF81eXUGSY=; b=WI/jorlkzUGQHfdQCgbvWOnu2e0hwWt0g5AjXHPDp0PhZNZ/xSOQ22YbuyefEzBdfX gmt5ZuNtKTdNViwORD/YYHZXOJwm4MVh1wWgHDXUOpUOgNozi4AYfc/CgG5Q9gEdy5VL DClCTmOWoBTFd2SmSazfSZ40698qjwkaqQ6kqJSNqpaqKQDJ+CkNOZH79bbbbpxgZVQe YgtJM+aLHZYEatHx1vW6srQKhPszXXdw6e5EAk6qgOXXUwH8g1GzQpJK95e1E0oSr5M4 XIBFS/wzlREBdUZQ9sWuH/uTLFJJtq/Iw071UESZNdB2KWDKsUvskVDCra1anDeEtMIM WoXQ== X-Gm-Message-State: APjAAAVcvnzRTtf9Ge8+ssprqFbaRvOkHleTUPoP+NKTXbFWNnCu2gB9 PuuyvXSGMbigB7UPsxMVNPh2rg== X-Received: by 2002:a63:3645:: with SMTP id d66mr15533541pga.337.1576465773063; Sun, 15 Dec 2019 19:09:33 -0800 (PST) Received: from localhost.localdomain ([240e:362:4f3:9700:194a:b273:fdd9:92e0]) by smtp.gmail.com with ESMTPSA id k60sm18021687pjh.22.2019.12.15.19.09.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Dec 2019 19:09:32 -0800 (PST) From: Zhangfei Gao To: Greg Kroah-Hartman , Arnd Bergmann , Herbert Xu , jonathan.cameron@huawei.com, grant.likely@arm.com, jean-philippe , Jerome Glisse , ilias.apalodimas@linaro.org, francois.ozog@linaro.org, kenneth-lee-2012@foxmail.com, Wangzhou , "haojian . zhuang" , guodong.xu@linaro.org Cc: linux-accelerators@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, iommu@lists.linux-foundation.org, Zhangfei Gao Subject: [PATCH v10 3/4] crypto: hisilicon - Remove module_param uacce_mode Date: Mon, 16 Dec 2019 11:08:16 +0800 Message-Id: <1576465697-27946-4-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1576465697-27946-1-git-send-email-zhangfei.gao@linaro.org> References: <1576465697-27946-1-git-send-email-zhangfei.gao@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Remove the module_param uacce_mode, which is not used currently. Signed-off-by: Zhangfei Gao Signed-off-by: Zhou Wang --- drivers/crypto/hisilicon/zip/zip_main.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) -- 2.7.4 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(); }