From: Alexander Duyck <alexander.h.duyck@intel.com>
To: bhelgaas@google.com, alexander.h.duyck@intel.com,
linux-pci@vger.kernel.org
Cc: virtio-dev@lists.oasis-open.org, kvm@vger.kernel.org,
netdev@vger.kernel.org, dan.daly@intel.com,
linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
keith.busch@intel.com, netanel@amazon.com, ddutile@redhat.com,
mheyne@amazon.de, liang-min.wang@intel.com,
mark.d.rustad@intel.com, dwmw2@infradead.org, hch@lst.de,
dwmw@amazon.co.uk
Subject: [pci PATCH v8 3/4] nvme: Migrate over to unmanaged SR-IOV support
Date: Fri, 20 Apr 2018 12:31:03 -0400 [thread overview]
Message-ID: <20180420163027.46077.93925.stgit@ahduyck-green-test.jf.intel.com> (raw)
In-Reply-To: <20180420162633.46077.49012.stgit@ahduyck-green-test.jf.intel.com>
Instead of implementing our own version of a SR-IOV configuration stub in
the nvme driver we can just reuse the existing
pci_sriov_configure_simple function.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
---
v5: Replaced call to pci_sriov_configure_unmanaged with
pci_sriov_configure_simple
v6: Dropped "#ifdef" checks for IOV wrapping sriov_configure definition
v7: No code change, added Reviewed-by
drivers/nvme/host/pci.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index b6f43b7..ad85cf35 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2581,24 +2581,6 @@ static void nvme_remove(struct pci_dev *pdev)
nvme_put_ctrl(&dev->ctrl);
}
-static int nvme_pci_sriov_configure(struct pci_dev *pdev, int numvfs)
-{
- int ret = 0;
-
- if (numvfs == 0) {
- if (pci_vfs_assigned(pdev)) {
- dev_warn(&pdev->dev,
- "Cannot disable SR-IOV VFs while assigned\n");
- return -EPERM;
- }
- pci_disable_sriov(pdev);
- return 0;
- }
-
- ret = pci_enable_sriov(pdev, numvfs);
- return ret ? ret : numvfs;
-}
-
#ifdef CONFIG_PM_SLEEP
static int nvme_suspend(struct device *dev)
{
@@ -2717,7 +2699,7 @@ static void nvme_error_resume(struct pci_dev *pdev)
.driver = {
.pm = &nvme_dev_pm_ops,
},
- .sriov_configure = nvme_pci_sriov_configure,
+ .sriov_configure = pci_sriov_configure_simple,
.err_handler = &nvme_err_handler,
};
next prev parent reply other threads:[~2018-04-20 16:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-20 16:28 [pci PATCH v8 0/4] Add support for unmanaged SR-IOV Alexander Duyck
2018-04-20 16:28 ` [pci PATCH v8 1/4] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources Alexander Duyck
2018-04-20 22:06 ` Gregory Rose
2018-04-21 7:05 ` Christoph Hellwig
2018-04-20 16:30 ` [pci PATCH v8 2/4] ena: Migrate over to unmanaged SR-IOV support Alexander Duyck
2018-04-20 22:10 ` Gregory Rose
2018-04-21 7:06 ` Christoph Hellwig
2018-04-20 16:31 ` Alexander Duyck [this message]
2018-04-21 7:06 ` [pci PATCH v8 3/4] nvme: " Christoph Hellwig
2018-04-20 16:31 ` [pci PATCH v8 4/4] pci-pf-stub: Add PF driver stub for PFs that function only to enable VFs Alexander Duyck
2018-04-20 22:08 ` Gregory Rose
2018-04-21 7:07 ` Christoph Hellwig
2018-07-19 10:52 ` Sunil Kovvuri
2018-07-19 15:12 ` Alexander Duyck
2018-04-20 17:23 ` [pci PATCH v8 0/4] Add support for unmanaged SR-IOV Randy Dunlap
2018-04-20 20:01 ` Alexander Duyck
2018-04-20 20:47 ` Randy Dunlap
2018-04-21 20:34 ` Bjorn Helgaas
2018-04-22 0:22 ` Alexander Duyck
2018-04-24 21:51 ` Bjorn Helgaas
2018-04-24 22:22 ` Alexander Duyck
2018-04-23 15:21 ` Don Dutile
2018-04-23 15:47 ` Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180420163027.46077.93925.stgit@ahduyck-green-test.jf.intel.com \
--to=alexander.h.duyck@intel.com \
--cc=bhelgaas@google.com \
--cc=dan.daly@intel.com \
--cc=ddutile@redhat.com \
--cc=dwmw2@infradead.org \
--cc=dwmw@amazon.co.uk \
--cc=hch@lst.de \
--cc=keith.busch@intel.com \
--cc=kvm@vger.kernel.org \
--cc=liang-min.wang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=mark.d.rustad@intel.com \
--cc=mheyne@amazon.de \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=virtio-dev@lists.oasis-open.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).