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, 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 v5 3/4] ena: Migrate over to unmanaged SR-IOV support
Date: Mon, 12 Mar 2018 10:23:28 -0700 [thread overview]
Message-ID: <20180312172309.3487.76690.stgit@localhost.localdomain> (raw)
In-Reply-To: <20180312171813.3487.94803.stgit@localhost.localdomain>
From: Alexander Duyck <alexander.h.duyck@intel.com>
Instead of implementing our own version of a SR-IOV configuration stub in
the ena driver we can just reuse the existing
pci_sriov_configure_simple function.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
---
v5: Replaced call to pci_sriov_configure_unmanaged with
pci_sriov_configure_simple
drivers/net/ethernet/amazon/ena/ena_netdev.c | 30 +++-----------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 6975150d144e..868069363bdd 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -3385,32 +3385,6 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/*****************************************************************************/
-static int ena_sriov_configure(struct pci_dev *dev, int numvfs)
-{
- int rc;
-
- if (numvfs > 0) {
- rc = pci_enable_sriov(dev, numvfs);
- if (rc != 0) {
- dev_err(&dev->dev,
- "pci_enable_sriov failed to enable: %d vfs with the error: %d\n",
- numvfs, rc);
- return rc;
- }
-
- return numvfs;
- }
-
- if (numvfs == 0) {
- pci_disable_sriov(dev);
- return 0;
- }
-
- return -EINVAL;
-}
-
-/*****************************************************************************/
-/*****************************************************************************/
/* ena_remove - Device Removal Routine
* @pdev: PCI device information struct
@@ -3525,7 +3499,9 @@ static int ena_resume(struct pci_dev *pdev)
.suspend = ena_suspend,
.resume = ena_resume,
#endif
- .sriov_configure = ena_sriov_configure,
+#ifdef CONFIG_PCI_IOV
+ .sriov_configure = pci_sriov_configure_simple,
+#endif
};
static int __init ena_init(void)
next prev parent reply other threads:[~2018-03-12 17:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 17:20 [pci PATCH v5 0/4] Series short description Alexander Duyck
2018-03-12 17:21 ` [pci PATCH v5 1/4] pci: Add pci_sriov_configure_simple for PFs that don't manage VF resources Alexander Duyck
2018-03-12 17:40 ` Keith Busch
2018-03-12 18:09 ` Alexander Duyck
2018-03-12 18:23 ` Keith Busch
2018-03-12 20:17 ` Alexander Duyck
2018-03-13 7:44 ` Christoph Hellwig
2018-03-12 17:23 ` [pci PATCH v5 2/4] virtio_pci: Add support for unmanaged SR-IOV on virtio_pci devices Alexander Duyck
2018-03-12 17:23 ` Alexander Duyck [this message]
2018-03-13 8:12 ` [pci PATCH v5 3/4] ena: Migrate over to unmanaged SR-IOV support David Woodhouse
2018-03-13 8:16 ` Christoph Hellwig
2018-03-13 8:45 ` David Woodhouse
2018-03-13 8:54 ` Christoph Hellwig
2018-03-13 9:14 ` David Woodhouse
2018-03-13 14:51 ` Alexander Duyck
2018-03-13 15:04 ` David Woodhouse
2018-03-13 16:17 ` Don Dutile
2018-03-12 17:23 ` [pci PATCH v5 4/4] nvme: " 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=20180312172309.3487.76690.stgit@localhost.localdomain \
--to=alexander.duyck@gmail.com \
--cc=alexander.h.duyck@intel.com \
--cc=bhelgaas@google.com \
--cc=dan.daly@intel.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).