LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Alexander Duyck <alexander.duyck@gmail.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 v7 1/5] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources Date: Thu, 15 Mar 2018 11:41:25 -0700 [thread overview] Message-ID: <20180315184055.3102.2435.stgit@localhost.localdomain> (raw) In-Reply-To: <20180315183449.3102.64791.stgit@localhost.localdomain> From: Alexander Duyck <alexander.h.duyck@intel.com> This patch adds a common configuration function called pci_sriov_configure_simple that will allow for managing VFs on devices where the PF is not capable of managing VF resources. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> --- v5: New patch replacing pci_sriov_configure_unmanaged with pci_sriov_configure_simple Dropped bits related to autoprobe changes v6: Defined pci_sriov_configure_simple as NULL if IOV is disabled v7: Updated pci_sriov_configure_simple to drop need for err value Fixed comment explaining why pci_sriov_configure_simple is NULL drivers/pci/iov.c | 31 +++++++++++++++++++++++++++++++ include/linux/pci.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 677924ae0350..3e0a7fdff3e9 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -807,3 +807,34 @@ int pci_sriov_get_totalvfs(struct pci_dev *dev) return dev->sriov->total_VFs; } EXPORT_SYMBOL_GPL(pci_sriov_get_totalvfs); + +/** + * pci_sriov_configure_simple - helper to configure unmanaged SR-IOV + * @dev: the PCI device + * @nr_virtfn: number of virtual functions to enable, 0 to disable + * + * Used to provide generic enable/disable SR-IOV option for devices + * that do not manage the VFs generated by their driver. Return value + * is negative on error, or number of VFs allocated on success. + */ +int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn) +{ + might_sleep(); + + if (!dev->is_physfn) + return -ENODEV; + + if (pci_vfs_assigned(dev)) { + pci_warn(dev, + "Cannot modify SR-IOV while VFs are assigned\n"); + return -EPERM; + } + + if (!nr_virtfn) { + sriov_disable(dev); + return 0; + } + + return sriov_enable(dev, nr_virtfn) ? : nr_virtfn; +} +EXPORT_SYMBOL_GPL(pci_sriov_configure_simple); diff --git a/include/linux/pci.h b/include/linux/pci.h index 024a1beda008..992202449829 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1953,6 +1953,7 @@ static inline void pci_mmcfg_late_init(void) { } int pci_vfs_assigned(struct pci_dev *dev); int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); int pci_sriov_get_totalvfs(struct pci_dev *dev); +int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn); resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno); void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); #else @@ -1980,6 +1981,8 @@ static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs) { return 0; } static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) { return 0; } +/* this is expected to be used as a function pointer, just define as NULL */ +#define pci_sriov_configure_simple NULL static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) { return 0; } static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }
next prev parent reply other threads:[~2018-03-15 18:41 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-15 18:40 [pci PATCH v7 0/5] Add support for unmanaged SR-IOV Alexander Duyck 2018-03-15 18:41 ` Alexander Duyck [this message] 2018-03-28 21:30 ` [virtio-dev] [pci PATCH v7 1/5] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources Rustad, Mark D 2018-03-15 18:42 ` [pci PATCH v7 2/5] virtio_pci: Add support for unmanaged SR-IOV on virtio_pci devices Alexander Duyck 2018-03-16 16:34 ` [virtio-dev] " Michael S. Tsirkin 2018-03-16 16:40 ` Alexander Duyck 2018-04-03 13:12 ` Michael S. Tsirkin 2018-04-03 17:32 ` Alexander Duyck 2018-04-03 18:27 ` Michael S. Tsirkin 2018-04-03 19:06 ` Alexander Duyck 2018-04-20 0:40 ` Michael S. Tsirkin 2018-04-20 14:56 ` Alexander Duyck 2018-04-20 15:28 ` Michael S. Tsirkin 2018-04-20 16:08 ` Alexander Duyck 2018-04-20 16:14 ` Michael S. Tsirkin 2018-04-21 7:05 ` Christoph Hellwig 2018-04-03 19:18 ` Rustad, Mark D 2018-03-28 21:31 ` Rustad, Mark D 2018-04-03 13:11 ` [virtio-dev] " Michael S. Tsirkin 2018-03-15 18:43 ` [pci PATCH v7 3/5] ena: Migrate over to unmanaged SR-IOV support Alexander Duyck 2018-03-15 18:43 ` [pci PATCH v7 4/5] nvme: " Alexander Duyck 2018-03-15 18:44 ` [pci PATCH v7 5/5] pci-pf-stub: Add PF driver stub for PFs that function only to enable VFs Alexander Duyck 2018-03-16 21:42 ` [pci PATCH v7 0/5] Add support for unmanaged SR-IOV Don Dutile 2018-04-19 22:54 ` Alexander Duyck 2018-04-20 0:46 ` Michael S. Tsirkin
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=20180315184055.3102.2435.stgit@localhost.localdomain \ --to=alexander.duyck@gmail.com \ --cc=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: linkBe 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).