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

Commit 1a676d2b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-next' 



Shradha Shah says:

====================
sfc: Enabling EF10 Vf's, set up vswitching and bind the SFC driver to the VF's

This set of patches makes way for the implementation of EF10
SR-IOV driver starting with some cleanup code.
NIC specific SR-IOV functions are moved to their own header
and netdev_ops are made generic instead of being NIC specific

Next in line comes the patch to enable VF's using sriov_configure.
VEB vswitching hierarchy is set up next followed by patches to
prepare sfc driver to bind to enabled VF's

This is followed by patch to support use of shared RSS contexts
which makes VF's use shared RSS contexts in all cases.

Patch series ends with a patch to bind the sfc driver to the
enabled VF's which creates network interfaces corresponding to
the VF's.

Coming up soon are the patches to set_vf_mac, set_vf_config,
set_vf_vlan, vf_spoofcheck, etc.

These patches have been tested with and without CONFIG_SFC_SRIOV.
In the case of CONFIG_SFC_SRIOV=y enabling of VF's using
sriov_configure is also tested. The enabled VF's bind to the
installed sfc driver succesfully to create network interfaces.
In the case of CONFIG_SFC_SRIOV=n enabling of VF's using
sriov_configure returns the correct error message:
"Function not implemented".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f926204b 6f7f8aa6

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)	+= 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

+343 −30

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/ef10_sriov.c

0 → 100644
+430 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/ef10_sriov.h

0 → 100644
+70 −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.

 */



#ifndef EF10_SRIOV_H

#define EF10_SRIOV_H



#include "net_driver.h"



/**

 * struct ef10_vf - PF's store of VF data

 * @vport_id: vport ID for the VF

 * @vport_assigned: record whether the vport is currently assigned to the VF

 * @mac: MAC address for the VF, zero when address is removed from the vport

 */

struct ef10_vf {

	unsigned int vport_id;

	unsigned int vport_assigned;

	u8 mac[ETH_ALEN];

};



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);

int efx_ef10_sriov_init(struct efx_nic *efx);

static inline void efx_ef10_sriov_mac_address_changed(struct efx_nic *efx) {}

static inline void efx_ef10_sriov_reset(struct efx_nic *efx) {}

void efx_ef10_sriov_fini(struct efx_nic *efx);

static inline void efx_ef10_sriov_flr(struct efx_nic *efx, unsigned vf_i) {}



static inline int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf,

					    u8 *mac)

{

	return -EOPNOTSUPP;

}



static inline int efx_ef10_sriov_set_vf_vlan(struct efx_nic *efx, int vf,

					     u16 vlan, u8 qos)

{

	return -EOPNOTSUPP;

}



static inline int efx_ef10_sriov_set_vf_spoofchk(struct efx_nic *efx, int vf,

						 bool spoofchk)

{

	return -EOPNOTSUPP;

}



static inline int efx_ef10_sriov_get_vf_config(struct efx_nic *efx, int vf,

					       struct ifla_vf_info *ivf)

{

	return -EOPNOTSUPP;

}



int efx_ef10_vswitching_probe_pf(struct efx_nic *efx);

int efx_ef10_vswitching_probe_vf(struct efx_nic *efx);

int efx_ef10_vswitching_restore_pf(struct efx_nic *efx);

int efx_ef10_vswitching_restore_vf(struct efx_nic *efx);

void efx_ef10_vswitching_remove_pf(struct efx_nic *efx);

void efx_ef10_vswitching_remove_vf(struct efx_nic *efx);



#endif /* EF10_SRIOV_H */

drivers/net/ethernet/sfc/efx.c

+128 −70

File changed.

Preview size limit exceeded, changes collapsed.