diff options
author | Keith Busch <keith.busch@intel.com> | 2016-06-20 17:41:06 +0200 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-07-21 05:29:59 +0200 |
commit | 13880f5b57adf34d050cf7e229a6326da45a7347 (patch) | |
tree | 837d243b16b78ee7844d1b9142a064104ddceffb | |
parent | nvme: initialize variable before logical OR'ing it (diff) | |
download | linux-13880f5b57adf34d050cf7e229a6326da45a7347.tar.xz linux-13880f5b57adf34d050cf7e229a6326da45a7347.zip |
nvme/pci: Provide SR-IOV support
This registers an sr-iov callback for nvme.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | drivers/nvme/host/pci.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 8083ae8ec96d..78e0048a3391 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2015,6 +2015,24 @@ 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) { @@ -2117,6 +2135,7 @@ static struct pci_driver nvme_driver = { .driver = { .pm = &nvme_dev_pm_ops, }, + .sriov_configure = nvme_pci_sriov_configure, .err_handler = &nvme_err_handler, }; |