Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp940966pxt; Thu, 5 Aug 2021 15:58:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7WJfu+r7eQ43qCok20CQXYZ9IgqSAgwDkWoiQqtH7fhHcl93cAHQyvEBW0TX1ktgJuCKO X-Received: by 2002:a17:906:9b87:: with SMTP id dd7mr6717569ejc.99.1628204306917; Thu, 05 Aug 2021 15:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628204306; cv=none; d=google.com; s=arc-20160816; b=LLyVjqJUk6v4oRVzzerBTkE1/P5mEiYgg+8a2Eh/NGJqlZfQuLvs8xmABMe2gR7SuH 9cGcoyZY7kDQN3xWbVgicr6cwXBisJx6L5OByFM5Vb7RlDdJ09vqFy0dzNvSKzINdQHO DO8b3ELVGYjA/TDSXtJ2i9ndPTb/+MaCzLHtD+Z545wslJwm+UO2S56DWKIyfByJutlx 4unsM6oWE30cJNeqtj20WDZYvY61WN0xQh7OPk+q0M/ptEZvL+rk8gy4mYUlDfgQGYny oOof/2dQxHc6T2O1s4sYYj0XMBO4bYfSodf3+nuBnebW/V3ktuYC+koJju0laybqEEiV M56g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NA26ldEevgU9Kgbw+CMj6/dnpBTFnhPjaZrrdKYCxCY=; b=XDuv30734mCRWN/A6l44oiPlZEK2+fN/XP+KD8YhYQ3JOTcBEyEo44MgUTo6U4MG+6 vq4/7QPx6UkJXTmAOLz8DxMscu9bYn/4Bup5HEqTI6GJwZDNRPRYk8sHuFRiF2Md4bfq DY0XMa0xu6IhQ0wEf2lZkz4pGwvZxHQ2YpmCbVQyAY0ZpSmzz1/ntzg4nZUZBuWhs3yu OXrVGTiL/bVORrRWFxKYobI5KaT8tGuuSfmP02CNXQoh9A30+upYhKEQ2W4E8orvxV5h eUM5iim6nA4gsXgqBQ/bDdmwNo/UKQaVBDRmhXT6Go0vJNUlchj4qZsv4GoStJvIV4xm b5FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TQf80RmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p7si7386573edq.323.2021.08.05.15.58.04; Thu, 05 Aug 2021 15:58:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TQf80RmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233915AbhHEQbO (ORCPT + 99 others); Thu, 5 Aug 2021 12:31:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232554AbhHEQaL (ORCPT ); Thu, 5 Aug 2021 12:30:11 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 469DDC0613D5; Thu, 5 Aug 2021 09:29:56 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id l19so10216579pjz.0; Thu, 05 Aug 2021 09:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NA26ldEevgU9Kgbw+CMj6/dnpBTFnhPjaZrrdKYCxCY=; b=TQf80RmT0RMS/677rYyeKUgAEvzu6s/HdZLSEpLkhc5E1IwUREjCKNrXrgRAmqcwKM i6jc88eeEukAtRn577nEE581kVsem5Skib/NkgGma9YUqmEk4Y1yHbpy8bLDTxPTlSY+ nT0SMwn/zGigC7i2Akkamc2z8htlt/M7RiMgJvsfNX5JYpWiUyq2fTIzKSdAkf5wnUgt IlD9pXu5bbh+7Xtqwm3E/J9/xa+7H7yPUgdOCr1V2Idr/RTf63AGacKXWiILtI6e2qZr VcrNHXhTxzBs5N0BfBYwvn+TZb8TQdoD58M2W6DKGZRzQhKQ5FC2fPkTre12g1RJ7lod Mdjg== 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:mime-version:content-transfer-encoding; bh=NA26ldEevgU9Kgbw+CMj6/dnpBTFnhPjaZrrdKYCxCY=; b=C8Q0Q0pmSB0nkJdn2aPNbQF3cuQk82LtJEN42/60BBAZuUPVz/Z1ELygP62tzYfRUa RybXBxBcm8+/pqzqaGf0AY6jXvqpfcp5kShLILoTqNXU49S87b+FK3Bntqj7bprRkvQR mrNf0D/dEKLO8yXQ0YQ3Y1C53PHwCMivCCYfZKRlQ1KoZHUA/Vwyi9A8pxhdUcn+kc9G TJhYjoJ3huFq8SteWoh9P9APL11ENPCnmOeZ2pLikUcgiywE03fakSE6yqsWuq9tEiYN GsUM4jbA3rxM5FWMv6FpKfs3FugQtzfVAS6ls6uxEYm88oxcYCKetx8zjiwvWeRp1apD 4j8w== X-Gm-Message-State: AOAM533GGemDNOUv4O83xWfRHjmxF8eOUDjBmB9wrpx/8u0pdnwipn5Y 2ke8uSj4TvoPRdjlFSecE+w= X-Received: by 2002:a17:902:c401:b029:12c:daac:c89e with SMTP id k1-20020a170902c401b029012cdaacc89emr4638619plk.42.1628180995843; Thu, 05 Aug 2021 09:29:55 -0700 (PDT) Received: from localhost.localdomain ([139.5.31.161]) by smtp.googlemail.com with ESMTPSA id nr6sm62551pjb.39.2021.08.05.09.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 09:29:55 -0700 (PDT) From: Amey Narkhede To: Bjorn Helgaas Cc: alex.williamson@redhat.com, Raphael Norwitz , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, kw@linux.com, Shanker Donthineni , Sinan Kaya , Len Brown , "Rafael J . Wysocki" , Amey Narkhede Subject: [PATCH v15 5/9] PCI: Allow userspace to query and set device reset mechanism Date: Thu, 5 Aug 2021 21:59:13 +0530 Message-Id: <20210805162917.3989-6-ameynarkhede03@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210805162917.3989-1-ameynarkhede03@gmail.com> References: <20210805162917.3989-1-ameynarkhede03@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add reset_method sysfs attribute to enable user to query and set user preferred device reset methods and their ordering. Co-developed-by: Alex Williamson Signed-off-by: Alex Williamson Signed-off-by: Amey Narkhede --- Documentation/ABI/testing/sysfs-bus-pci | 19 ++++ drivers/pci/pci-sysfs.c | 1 + drivers/pci/pci.c | 117 ++++++++++++++++++++++++ drivers/pci/pci.h | 2 + 4 files changed, 139 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index ef00fada2efb..ef66b62bf025 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci @@ -121,6 +121,25 @@ Description: child buses, and re-discover devices removed earlier from this part of the device tree. +What: /sys/bus/pci/devices/.../reset_method +Date: March 2021 +Contact: Amey Narkhede +Description: + Some devices allow an individual function to be reset + without affecting other functions in the same slot. + + For devices that have this support, a file named + reset_method will be present in sysfs. Initially reading + this file will give names of the device supported reset + methods and their ordering. After write, this file will + give names and ordering of currently enabled reset methods. + Writing the name or space separated list of names of any of + the device supported reset methods to this file will set + the reset methods and their ordering to be used when + resetting the device. Writing empty string to this file + will disable ability to reset the device and writing + "default" will return to the original value. + What: /sys/bus/pci/devices/.../reset Date: July 2009 Contact: Michael S. Tsirkin diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 316f70c3e3b4..54ee7193b463 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1491,6 +1491,7 @@ const struct attribute_group *pci_dev_groups[] = { &pci_dev_config_attr_group, &pci_dev_rom_attr_group, &pci_dev_reset_attr_group, + &pci_dev_reset_method_attr_group, &pci_dev_vpd_attr_group, #ifdef CONFIG_DMI &pci_dev_smbios_attr_group, diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8a516e9ca316..53d73770881f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5132,6 +5132,123 @@ static const struct pci_reset_fn_method pci_reset_fn_methods[] = { { pci_reset_bus_function, .name = "bus" }, }; +static ssize_t reset_method_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct pci_dev *pdev = to_pci_dev(dev); + ssize_t len = 0; + int i, m; + + for (i = 0; i < PCI_NUM_RESET_METHODS; i++) { + m = pdev->reset_methods[i]; + if (!m) + break; + + len += sysfs_emit_at(buf, len, "%s%s", len ? " " : "", + pci_reset_fn_methods[m].name); + } + + if (len) + len += sysfs_emit_at(buf, len, "\n"); + + return len; +} + +static ssize_t reset_method_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct pci_dev *pdev = to_pci_dev(dev); + int i, m = 0, n = 0; + char *name, *options; + + if (count >= (PAGE_SIZE - 1)) + return -EINVAL; + + if (sysfs_streq(buf, "")) { + goto exit; + } + + if (sysfs_streq(buf, "default")) { + pci_init_reset_methods(pdev); + return count; + } + + options = kstrndup(buf, count, GFP_KERNEL); + if (!options) + return -ENOMEM; + + while ((name = strsep(&options, " ")) != NULL) { + if (sysfs_streq(name, "")) + continue; + + name = strim(name); + + for (m = 1; m < PCI_NUM_RESET_METHODS; m++) { + if (sysfs_streq(name, pci_reset_fn_methods[m].name)) + break; + } + + if (m == PCI_NUM_RESET_METHODS) { + pci_warn(pdev, "Skip invalid reset method '%s'", name); + continue; + } + + for (i = 0; i < n; i++) { + if (pdev->reset_methods[i] == m) + break; + } + + if (i < n) + continue; + + if (pci_reset_fn_methods[m].reset_fn(pdev, 1)) { + pci_warn(pdev, "Unsupported reset method '%s'", name); + continue; + } + + pdev->reset_methods[n++] = m; + BUG_ON(n == PCI_NUM_RESET_METHODS); + } + + kfree(options); + +exit: + /* All the reset methods are invalid */ + if (n == 0 && m == PCI_NUM_RESET_METHODS) + return -EINVAL; + pdev->reset_methods[n] = 0; + if (pdev->reset_methods[0] == 0) { + pci_warn(pdev, "All device reset methods disabled by user"); + } else if ((pdev->reset_methods[0] != 1) && + !pci_reset_fn_methods[1].reset_fn(pdev, 1)) { + pci_warn(pdev, "Device specific reset disabled/de-prioritized by user"); + } + return count; +} +static DEVICE_ATTR_RW(reset_method); + +static struct attribute *pci_dev_reset_method_attrs[] = { + &dev_attr_reset_method.attr, + NULL, +}; + +static umode_t pci_dev_reset_method_attr_is_visible(struct kobject *kobj, + struct attribute *a, int n) +{ + struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj)); + + if (!pci_reset_supported(pdev)) + return 0; + + return a->mode; +} + +const struct attribute_group pci_dev_reset_method_attr_group = { + .attrs = pci_dev_reset_method_attrs, + .is_visible = pci_dev_reset_method_attr_is_visible, +}; + /** * __pci_reset_function_locked - reset a PCI device function while holding * the @dev mutex lock. diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 7438953745e0..31458d48eda7 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -714,4 +714,6 @@ static inline int pci_acpi_program_hp_params(struct pci_dev *dev) extern const struct attribute_group aspm_ctrl_attr_group; #endif +extern const struct attribute_group pci_dev_reset_method_attr_group; + #endif /* DRIVERS_PCI_H */ -- 2.32.0