From patchwork Fri Oct 14 09:38:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yekai (A)" X-Patchwork-Id: 2625 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp89681wrs; Fri, 14 Oct 2022 02:50:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM54rVOhjPVaMZ2pFlfL5j9aVf8xx3+jIrXJ1HeQaZONOdEBC8q6aF4dqU5ArHXNrGyH4VuR X-Received: by 2002:a17:90b:1b4c:b0:20d:70d8:1491 with SMTP id nv12-20020a17090b1b4c00b0020d70d81491mr16262471pjb.3.1665741009570; Fri, 14 Oct 2022 02:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665741009; cv=none; d=google.com; s=arc-20160816; b=jkxxe1rIiIQoa+5obxLwpmSnYWemI+uLg8R8ECFNmn/lmy0u4Gp6R4tKoWS02gvdY5 trgSX9GKZ5xWUHMkwRM+zMG+ue2JYefF4DWmm2gt8i3bHpU+DEzc23B5MuqHnYfALeSj 0Xpw9fThRgzDKdO6I2zATCt8sSlo7Uv4x9FR1AcshXC5+BOf6NonCDjYmUKqr1gg4dEY gKzqAJFkS/dktjCufdUUW8Cfw4KHcUUUBm7iC10mYPQHEq9TKyCFsoBzS/9uQ75HFO5u K0JMFfjoRqfQuX5PAxnaq3icK26SJ9QiRHFX/IX5CIL2iarSc/HaFCK3HinPag3FMiMo I2gQ== 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=DpFzI98i5WVAd9cmiTjagtGyU2+V4l2m+7U8Sg79/7o=; b=rDrdWvkYl+FFRTxjdlro6UjwkWGxAKKLM8RI/ldR9nMBwhp5xltvkM6EmhYhMcTm7L fGm5bLfd/dhkb6t85hf2GT23o/tnrqDVCHskOwe48C4eV6hAVo+FSHx3kbIWXrdbx+CL HIr/v0LqpMR0ovi1x/e92cmdZMVnwjqwei5E7r+cULF/e4pFtcS1NoeRtb38E8m4OT2P DPBOXJkjctnYGQAPiL7huI4Xxh+XF+EroSS7m5iUKkKCNKJGVlla+PuAQTx5WsMHsXQ9 wRaPOexZJY1hUKSakoQDgXU1j+NBI/scOiyl6iypHJDDL6/9a+oUwZGJMl3I71Sdb8NR 6sxw== 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 t8-20020a170902e84800b0017f863024acsi2762980plg.235.2022.10.14.02.49.55; Fri, 14 Oct 2022 02:50:08 -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 S229919AbiJNJoF (ORCPT + 99 others); Fri, 14 Oct 2022 05:44:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229585AbiJNJnv (ORCPT ); Fri, 14 Oct 2022 05:43:51 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DAD114DF3F; Fri, 14 Oct 2022 02:43:50 -0700 (PDT) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MphDH4vnYz1P7RV; Fri, 14 Oct 2022 17:39:11 +0800 (CST) Received: from dggpeml100012.china.huawei.com (7.185.36.121) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 14 Oct 2022 17:43:48 +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; Fri, 14 Oct 2022 17:43:48 +0800 From: Kai Ye To: CC: , , , Subject: [PATCH 2/3] crypto: hisilicon/qm - add pci bdf number check Date: Fri, 14 Oct 2022 09:38:06 +0000 Message-ID: <20221014093807.3101-3-yekai13@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221014093807.3101-1-yekai13@huawei.com> References: <20221014093807.3101-1-yekai13@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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?1746656044253053165?= X-GMAIL-MSGID: =?utf-8?q?1746656044253053165?= The pci bdf number check is added for qos written by using the pci api. 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 335e58018a31..661cc964e2eb 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -4591,49 +4591,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; }