9 files changed, 87 insertions, 1 deletions

diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile
index a08a789f8378..ce8470fe79d5 100644
--- a/drivers/net/ethernet/sfc/Makefile
+++ b/drivers/net/ethernet/sfc/Makefile
@@ -3,6 +3,6 @@ sfc-y			+= efx.o nic.o farch.o falcon.o siena.o ef10.o tx.o \
                            tenxpress.o txc43128_phy.o falcon_boards.o \
                            mcdi.o mcdi_port.o mcdi_mon.o ptp.o
 sfc-$(CONFIG_SFC_MTD)   += mtd.o
-sfc-$(CONFIG_SFC_SRIOV) += sriov.o siena_sriov.o
+sfc-$(CONFIG_SFC_SRIOV) += sriov.o siena_sriov.o ef10_sriov.o
 
 obj-$(CONFIG_SFC)       += sfc.o
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 4dab1b92ba18..68900293ef7b 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -3690,6 +3690,7 @@ const struct efx_nic_type efx_hunt_a0_nic_type = {
         .ptp_write_host_time = efx_ef10_ptp_write_host_time,
         .ptp_set_ts_sync_events = efx_ef10_ptp_set_ts_sync_events,
         .ptp_set_ts_config = efx_ef10_ptp_set_ts_config,
+        .sriov_configure = efx_ef10_sriov_configure,
         .sriov_init = efx_ef10_sriov_init,
         .sriov_fini = efx_ef10_sriov_fini,
         .sriov_mac_address_changed = efx_ef10_sriov_mac_address_changed,
diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
new file mode 100644
index 000000000000..9e6a3e197e01
--- /dev/null
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -0,0 +1,52 @@
+/****************************************************************************
+ * Driver for Solarflare network controllers and boards
+ * Copyright 2015 Solarflare Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+#include <linux/pci.h>
+#include <linux/module.h>
+#include "net_driver.h"
+#include "efx.h"
+#include "nic.h"
+#include "mcdi_pcol.h"
+
+#ifdef CONFIG_SFC_SRIOV
+static int efx_ef10_pci_sriov_enable(struct efx_nic *efx, int num_vfs)
+{
+        int rc = 0;
+        struct pci_dev *dev = efx->pci_dev;
+
+        efx->vf_count = num_vfs;
+        rc = pci_enable_sriov(dev, num_vfs);
+        if (rc) {
+                efx->vf_count = 0;
+                netif_err(efx, probe, efx->net_dev,
+                          "Failed to enable SRIOV VFs\n");
+        }
+        return rc;
+}
+
+static int efx_ef10_pci_sriov_disable(struct efx_nic *efx)
+{
+        struct pci_dev *dev = efx->pci_dev;
+
+        efx->vf_count = 0;
+        pci_disable_sriov(dev);
+        return 0;
+}
+#endif
+
+int efx_ef10_sriov_configure(struct efx_nic *efx, int num_vfs)
+{
+#ifdef CONFIG_SFC_SRIOV
+        if (num_vfs == 0)
+                return efx_ef10_pci_sriov_disable(efx);
+        else
+                return efx_ef10_pci_sriov_enable(efx, num_vfs);
+#else
+        return -EOPNOTSUPP;
+#endif
+}
diff --git a/drivers/net/ethernet/sfc/ef10_sriov.h b/drivers/net/ethernet/sfc/ef10_sriov.h
index 030bca44ab01..6ea115e3c3f2 100644
--- a/drivers/net/ethernet/sfc/ef10_sriov.h
+++ b/drivers/net/ethernet/sfc/ef10_sriov.h
@@ -17,6 +17,8 @@ static inline bool efx_ef10_sriov_wanted(struct efx_nic *efx)
         return false;
 }
 
+int efx_ef10_sriov_configure(struct efx_nic *efx, int num_vfs);
+
 static inline int efx_ef10_sriov_init(struct efx_nic *efx)
 {
         return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 232c76689076..fa9ce2adf542 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -3047,6 +3047,26 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
         return rc;
 }
 
+/* efx_pci_sriov_configure returns the actual number of Virtual Functions
+ * enabled on success
+ */
+#ifdef CONFIG_SFC_SRIOV
+static int efx_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
+{
+        int rc;
+        struct efx_nic *efx = pci_get_drvdata(dev);
+
+        if (efx->type->sriov_configure) {
+                rc = efx->type->sriov_configure(efx, num_vfs);
+                if (rc)
+                        return rc;
+                else
+                        return num_vfs;
+        } else
+                return -ENOSYS;
+}
+#endif
+
 static int efx_pm_freeze(struct device *dev)
 {
         struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
@@ -3269,6 +3289,9 @@ static struct pci_driver efx_pci_driver = {
         .remove         = efx_pci_remove,
         .driver.pm      = &efx_pm_ops,
         .err_handler    = &efx_err_handlers,
+#ifdef CONFIG_SFC_SRIOV
+        .sriov_configure = efx_pci_sriov_configure,
+#endif
 };
 
 /**************************************************************************
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index ae0d145a5bed..a6f4d9aadd40 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1330,6 +1330,7 @@ struct efx_nic_type {
         int (*ptp_set_ts_sync_events)(struct efx_nic *efx, bool en, bool temp);
         int (*ptp_set_ts_config)(struct efx_nic *efx,
                                  struct hwtstamp_config *init);
+        int (*sriov_configure)(struct efx_nic *efx, int num_vfs);
         int (*sriov_init)(struct efx_nic *efx);
         void (*sriov_fini)(struct efx_nic *efx);
         void (*sriov_mac_address_changed)(struct efx_nic *efx);
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index 3671e1dd42ca..49792287dd67 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -998,6 +998,7 @@ const struct efx_nic_type siena_a0_nic_type = {
 #endif
         .ptp_write_host_time = siena_ptp_write_host_time,
         .ptp_set_ts_config = siena_ptp_set_ts_config,
+        .sriov_configure = efx_siena_sriov_configure,
         .sriov_init = efx_siena_sriov_init,
         .sriov_fini = efx_siena_sriov_fini,
         .sriov_mac_address_changed = efx_siena_sriov_mac_address_changed,
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c
index ccadd4634001..9366756e6101 100644
--- a/drivers/net/ethernet/sfc/siena_sriov.c
+++ b/drivers/net/ethernet/sfc/siena_sriov.c
@@ -1701,3 +1701,8 @@ bool efx_siena_sriov_wanted(struct efx_nic *efx)
         return false;
 #endif
 }
+
+int efx_siena_sriov_configure(struct efx_nic *efx, int num_vfs)
+{
+        return 0;
+}
diff --git a/drivers/net/ethernet/sfc/siena_sriov.h b/drivers/net/ethernet/sfc/siena_sriov.h
index 5014ae41df65..8b2ca430a4ea 100644
--- a/drivers/net/ethernet/sfc/siena_sriov.h
+++ b/drivers/net/ethernet/sfc/siena_sriov.h
@@ -41,6 +41,7 @@
         ((EFX_MAX_VF_EVQ_SIZE + 2 * EFX_MAX_DMAQ_SIZE) *        \
          sizeof(efx_qword_t) / EFX_BUF_SIZE)
 
+int efx_siena_sriov_configure(struct efx_nic *efx, int num_vfs);
 int efx_siena_sriov_init(struct efx_nic *efx);
 void efx_siena_sriov_fini(struct efx_nic *efx);
 void efx_siena_sriov_mac_address_changed(struct efx_nic *efx);