Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25672dba authored by Shradha Shah's avatar Shradha Shah Committed by David S. Miller
Browse files

sfc: Enable VF's via a write to the sysfs file sriov_numvfs 



This patch adds support for the use of sriov_configure on EF10
to enable Virtual Functions while the driver is loaded.

Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d92916f7

drivers/net/ethernet/sfc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/sfc/ef10.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/sfc/ef10_sriov.c

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/****************************************************************************

 * 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

}

drivers/net/ethernet/sfc/ef10_sriov.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/sfc/efx.c

+23 −0
Original line number Diff line number Diff line
@@ -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

};



/**************************************************************************