From patchwork Sat Oct 22 01:17:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yekai (A)" X-Patchwork-Id: 7057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp985398wrr; Fri, 21 Oct 2022 18:28:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6TPETIc2QPIlL1NWBGdgagN5kUNm9JsL8yHirMty3RjfXgsHOjBAyP/6jNG9R93qK+2621 X-Received: by 2002:a05:6402:8cc:b0:45c:a5c9:c0a with SMTP id d12-20020a05640208cc00b0045ca5c90c0amr19855435edz.135.1666402134957; Fri, 21 Oct 2022 18:28:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666402134; cv=none; d=google.com; s=arc-20160816; b=E38I9WjVpV7oIdlCay/HY3fVuuTpozh43UzYBrPIhe1srN0VTwmEzjayImYezUpPg3 idGQ1bGOU0sPyA164kqXcfb7H2hJw1brIU6OFYJkIS9+U7zTQ1JCtaaV5TguFIi9M+id knwQKD1iQtV+z7v9wWWvIPcURXqanejPjZxPRnAzwcDZhgySQl7WVCei6zUy8kG1l16f aGx20PxY5UQmSxkA+Blas7ZxrV0O4FaGI2Vd6gFRAPboJqdVkEcFmu0i+qTCDpOIjX7d tB+debhibHXlnU9/KyoIK5ydJgXrDvr5quLRhjYumgWPSCPlJ6bMAEEiGzXhaPZK9cBD 3ksQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=KCyMXomirBhNE+PGYaW2ctJtm3ZZvMGDsppN/at8JsU=; b=CzxG4MKy5lMql6S7FgyR6f2JQ8J9unwuusR/JiQhngIoOZoHWWSLpoNSE0OV3QU6vM jMvmM0kWCtYLGKWoIbF5FGMxvmub1ipMJzTWhM3R5Qwrk3wYfYLyhof42h77AbydK7zS mpbM1UE+5mhmZC4Rx4k1501nIbqe641hhObMP92DAmvZ9PR9V+rZr9jFS+eWtm/fT/ph +XezfDoHKp6XoVhn2tcBsmrIyqpuCuoHOYlXLPo9Jz21juiLgVQiZGvuX0COZmIvFokY MX3UuXa0rMbYfvYkCZ9dj5MQ0uxdeo+2wBDUeWIFaPMao7PfnDD+GaDFKWlTxfVygaBZ 2iRA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go12-20020a1709070d8c00b0078e319dcca7si19830883ejc.744.2022.10.21.18.28.29; Fri, 21 Oct 2022 18:28:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229808AbiJVBXq (ORCPT + 99 others); Fri, 21 Oct 2022 21:23:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbiJVBXj (ORCPT ); Fri, 21 Oct 2022 21:23:39 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22ED32B3200; Fri, 21 Oct 2022 18:23:38 -0700 (PDT) Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MvNmt20l4zpVfr; Sat, 22 Oct 2022 09:20:14 +0800 (CST) Received: from dggpeml100012.china.huawei.com (7.185.36.121) by dggpeml500025.china.huawei.com (7.185.36.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 22 Oct 2022 09:23:35 +0800 Received: from huawei.com (10.67.165.24) by dggpeml100012.china.huawei.com (7.185.36.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 22 Oct 2022 09:23:35 +0800 From: Kai Ye To: CC: , , Subject: [PATCH v3 2/3] crypto: hisilicon/qm - add pci bdf number check Date: Sat, 22 Oct 2022 01:17:45 +0000 Message-ID: <20221022011746.27197-3-yekai13@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221022011746.27197-1-yekai13@huawei.com> References: <20221022011746.27197-1-yekai13@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml100012.china.huawei.com (7.185.36.121) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747349284845832460?= X-GMAIL-MSGID: =?utf-8?q?1747349284845832460?= The pci bdf number check is added for qos written by using the pci api. Directly get the devfn by pci_dev, so delete some redundant code. And use the kstrtoul instead of sscanf to simplify code. Signed-off-by: Kai Ye --- drivers/crypto/hisilicon/qm.c | 37 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index 5d79e9f0e7e1..80eeb966cf89 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -4589,49 +4589,36 @@ static ssize_t qm_algqos_read(struct file *filp, char __user *buf, return ret; } -static ssize_t qm_qos_value_init(const char *buf, unsigned long *val) -{ - int buflen = strlen(buf); - int ret, i; - - for (i = 0; i < buflen; i++) { - if (!isdigit(buf[i])) - return -EINVAL; - } - - ret = sscanf(buf, "%lu", val); - if (ret != QM_QOS_VAL_NUM) - return -EINVAL; - - return 0; -} - static ssize_t qm_get_qos_value(struct hisi_qm *qm, const char *buf, unsigned long *val, unsigned int *fun_index) { + struct bus_type *bus_type = qm->pdev->dev.bus; char tbuf_bdf[QM_DBG_READ_LEN] = {0}; char val_buf[QM_DBG_READ_LEN] = {0}; - u32 tmp1, device, function; - int ret, bus; + struct pci_dev *pdev; + struct device *dev; + int ret; ret = sscanf(buf, "%s %s", tbuf_bdf, val_buf); if (ret != QM_QOS_PARAM_NUM) return -EINVAL; - ret = qm_qos_value_init(val_buf, val); + ret = kstrtoul(val_buf, 10, val); if (ret || *val == 0 || *val > QM_QOS_MAX_VAL) { pci_err(qm->pdev, "input qos value is error, please set 1~1000!\n"); return -EINVAL; } - ret = sscanf(tbuf_bdf, "%u:%x:%u.%u", &tmp1, &bus, &device, &function); - if (ret != QM_QOS_BDF_PARAM_NUM) { - pci_err(qm->pdev, "input pci bdf value is error!\n"); - return -EINVAL; + dev = bus_find_device_by_name(bus_type, NULL, tbuf_bdf); + if (!dev) { + pci_err(qm->pdev, "input pci bdf number is error!\n"); + return -ENODEV; } - *fun_index = PCI_DEVFN(device, function); + pdev = container_of(dev, struct pci_dev, dev); + + *fun_index = pdev->devfn; return 0; }