From patchwork Tue Dec 10 02:42:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 181105 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5194497ile; Mon, 9 Dec 2019 18:43:58 -0800 (PST) X-Google-Smtp-Source: APXvYqxXCCoF0YZCIP4KPp10xXyNrBy5jsdCwhf46kbsuxF0r5VWZoWMc5A0KJ1+Bg2P+e7KTen5 X-Received: by 2002:a9d:7:: with SMTP id 7mr22075003ota.26.1575945838140; Mon, 09 Dec 2019 18:43:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575945838; cv=none; d=google.com; s=arc-20160816; b=j8JkOgpWuwPEVrald5bv89MxNYHOufBpEPNxD0Am5IB5YVeFSfTh/OXLbY2WeNrSHk mArHUb54B9ODWgaknRbI1PgBvDGtLzUfWjzuBo2k+vafCosmsvLOKRxLOwaA/lyqoBPs JCZbiljr1rLlPPazIjn7jXJXnCD/yNctZ4bxrzYYP5tX4rzam3nHiM+nNJJ35TyAo7kZ ndAbylUDCh7S5SBDp5MBrsWGGwNNQrPnH2tSz5ZLdQwAXngafFiMt8LUDJaLZG/O1H6d CYFGg6kj5WG56tn98Jphiav6dwTyI7SEbMVrBxHr2rP9CZfK1kYGevRMhX+qTMer9v1J elXg== 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=WXaMUGtN1Xb5/R2iAvF7FHOtLbD5TnSyGYOWKcgYV/xpNJxadMqTv+c9OclgzW6zz6 NHZoI14dhim1lfumVvQY7168M7Fb+qQ0cIpPJe1zHWfvkR5HCdp0XeiCzUsmyTzPHmjn DBt1A5/2RGaRYAl8oNXdOJtl7VMz/v0gLrYPIjCHDroOdvIoEmRM+xpQYYBkhQ3S8GLP +/7BPfMJO2ulWb8RpO+q9yGG8WICsJnuIG0SGE4hQe/nNv7IZz6WofTNp6vXE1p5Appv fdNZWjMcQ07Hyzwn1H+H3k569Cwob/pG50RUStfBGbCx3am2V2PXGjURSGjqMCqVY6tf a+5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y2RNUSwA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 n11si1025884otf.125.2019.12.09.18.43.57; Mon, 09 Dec 2019 18:43:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=Y2RNUSwA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1726930AbfLJCn4 (ORCPT + 27 others); Mon, 9 Dec 2019 21:43:56 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:45474 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726718AbfLJCn4 (ORCPT ); Mon, 9 Dec 2019 21:43:56 -0500 Received: by mail-pl1-f196.google.com with SMTP id w7so6627581plz.12 for ; Mon, 09 Dec 2019 18:43:56 -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=Y2RNUSwAXifJcQebUPMgVLxf/MudfCJaiOKVS3Ae26rZaAh6MymPdTdO4VoQrfMxVK IYKXAga4IeE37eq/4LxHdQ6qu4uNCZZpOEkeDCfBNc1kbbR2/9TKYRbSdN8UMu3dKBMC mPLiY9gBOjp81TQjQR1z9/vd33QGfFPrJeX5v6Z+fmV/p4APogD9ScTCoMGO5vbVooHm TnjwvC6pze8E+kaJ3obAxvVJ+MUGFYRSlF7gmFoGi5MyD8wDc0wQ94OYPLwcA88cADvm OHXIZIqYYLXpMvHrN9NUw4CNGKRdU2+3mIAjJbqDdCUw8r56wgL/LBR+keX70INz6Xqp xtgw== 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=IXEmUCmz5nVG/tXqDRxmI8932E2Lb4GodnbL6lNkBy6G/tViFDSSDSbtStUuf1+etb 0O90U5mbA0xgW8eFtwpnqS3E2jw4iBCARx+mEYnurbolSj/R3rcxf5zM5O1YqtTvo1c1 TaHk2T04zqgDfpgwmuHzRQg6bL7cztxDTyDYh9gTHqmszuSPMqZgVTzUsoZeCrWSmUXY QXnSDHZVlK+HXqG9XbzqhLNddJMOScdwNFRvgK8EUwiuyIln1oUJwOd5FR18Pg76V83k H7GpWWPLX0JrKEhfNlG/B0N8hI2UAb+uAj2fHg3mrP+ZYltpdkTfDuNEQmioatfi2dCR GfvQ== X-Gm-Message-State: APjAAAUmJ3mYeMLbPlEnzWM4hI3ykp2eCbHQ0Y07QfZ3ACW0j66aXqBn wp5y76m4GOckpLZzm4MT8NS5ug== X-Received: by 2002:a17:902:c58e:: with SMTP id p14mr32342459plx.202.1575945835911; Mon, 09 Dec 2019 18:43:55 -0800 (PST) Received: from localhost.localdomain ([240e:362:417:e00:ed89:9d55:8cd5:6d38]) by smtp.gmail.com with ESMTPSA id r6sm826422pfh.91.2019.12.09.18.43.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Dec 2019 18:43:55 -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: [RESEND PATCH v9 3/4] crypto: hisilicon - Remove module_param uacce_mode Date: Tue, 10 Dec 2019 10:42:34 +0800 Message-Id: <1575945755-27380-4-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1575945755-27380-1-git-send-email-zhangfei.gao@linaro.org> References: <1575945755-27380-1-git-send-email-zhangfei.gao@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(); }