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

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

Merge branch 'nfp-SR-IOV-ndos-support' 



Jakub Kicinski says:

====================
nfp: SR-IOV ndos support

This set adds basic SR-IOV including setting/getting VF MAC addresses,
VLANs, link state and spoofcheck settings.  It is wired up for both
vNICs and representors (note: ip link will not report VF settings on
VF/PF representors because they are not linked to the PF PCI device).

Pablo and team add the basic implementation, Simon and Dirk follow
up with the representor plumbing.
====================

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

drivers/net/ethernet/netronome/nfp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ nfp-objs := \ 
	    nfp_net_ethtool.o \

	    nfp_net_main.o \

	    nfp_net_repr.o \

	    nfp_net_sriov.o \

	    nfp_netvf_main.o \

	    nfp_port.o \

	    bpf/main.o \

drivers/net/ethernet/netronome/nfp/nfp_main.h

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ struct nfp_rtsym_table; 
 * @mac_stats_mem:	Pointer to mapped MAC stats area

 * @vf_cfg_bar:		Pointer to the CPP area for the VF configuration BAR

 * @vf_cfg_mem:		Pointer to mapped VF configuration area

 * @vfcfg_tbl2_area:	Pointer to the CPP area for the VF config table

 * @vfcfg_tbl2:		Pointer to mapped VF config table

 * @irq_entries:	Array of MSI-X entries for all vNICs

 * @limit_vfs:		Number of VFs supported by firmware (~0 for PCI limit)

 * @num_vfs:		Number of SR-IOV VFs enabled
@@ -107,6 +109,8 @@ struct nfp_pf { 
	u8 __iomem *mac_stats_mem;

	struct nfp_cpp_area *vf_cfg_bar;

	u8 __iomem *vf_cfg_mem;

	struct nfp_cpp_area *vfcfg_tbl2_area;

	u8 __iomem *vfcfg_tbl2;



	struct msix_entry *irq_entries;

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+6 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#include "nfp_app.h"

#include "nfp_net_ctrl.h"

#include "nfp_net.h"

#include "nfp_net_sriov.h"

#include "nfp_port.h"



/**
@@ -3421,6 +3422,11 @@ const struct net_device_ops nfp_net_netdev_ops = { 
	.ndo_get_stats64	= nfp_net_stat64,

	.ndo_vlan_rx_add_vid	= nfp_net_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= nfp_net_vlan_rx_kill_vid,

	.ndo_set_vf_mac         = nfp_app_set_vf_mac,

	.ndo_set_vf_vlan        = nfp_app_set_vf_vlan,

	.ndo_set_vf_spoofchk    = nfp_app_set_vf_spoofchk,

	.ndo_get_vf_config	= nfp_app_get_vf_config,

	.ndo_set_vf_link_state  = nfp_app_set_vf_link_state,

	.ndo_setup_tc		= nfp_port_setup_tc,

	.ndo_tx_timeout		= nfp_net_tx_timeout,

	.ndo_set_rx_mode	= nfp_net_set_rx_mode,

drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define   NFP_NET_CFG_UPDATE_BPF	  (0x1 << 10) /* BPF program load */

#define   NFP_NET_CFG_UPDATE_MACADDR	  (0x1 << 11) /* MAC address change */

#define   NFP_NET_CFG_UPDATE_MBOX	  (0x1 << 12) /* Mailbox update */

#define   NFP_NET_CFG_UPDATE_VF		  (0x1 << 13) /* VF settings change */

#define   NFP_NET_CFG_UPDATE_ERR          (0x1 << 31) /* A error occurred */

#define NFP_NET_CFG_TXRS_ENABLE         0x0008

#define NFP_NET_CFG_RXRS_ENABLE         0x0010

drivers/net/ethernet/netronome/nfp/nfp_net_main.c

+19 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include "nfpcore/nfp6000_pcie.h"

#include "nfp_app.h"

#include "nfp_net_ctrl.h"

#include "nfp_net_sriov.h"

#include "nfp_net.h"

#include "nfp_main.h"

#include "nfp_port.h"
@@ -489,6 +490,8 @@ static void nfp_net_pf_app_stop(struct nfp_pf *pf) 


static void nfp_net_pci_unmap_mem(struct nfp_pf *pf)

{

	if (pf->vfcfg_tbl2_area)

		nfp_cpp_area_release_free(pf->vfcfg_tbl2_area);

	if (pf->vf_cfg_bar)

		nfp_cpp_area_release_free(pf->vf_cfg_bar);

	if (pf->mac_stats_bar)
@@ -535,17 +538,32 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf) 
		pf->vf_cfg_mem = NULL;

	}



	min_size = NFP_NET_VF_CFG_SZ * pf->limit_vfs + NFP_NET_VF_CFG_MB_SZ;

	pf->vfcfg_tbl2 = nfp_net_pf_map_rtsym(pf, "net.vfcfg_tbl2",

					      "_pf%d_net_vf_cfg2",

					      min_size, &pf->vfcfg_tbl2_area);

	if (IS_ERR(pf->vfcfg_tbl2)) {

		if (PTR_ERR(pf->vfcfg_tbl2) != -ENOENT) {

			err = PTR_ERR(pf->vfcfg_tbl2);

			goto err_unmap_vf_cfg;

		}

		pf->vfcfg_tbl2 = NULL;

	}



	mem = nfp_cpp_map_area(pf->cpp, "net.qc", 0, 0,

			       NFP_PCIE_QUEUE(0), NFP_QCP_QUEUE_AREA_SZ,

			       &pf->qc_area);

	if (IS_ERR(mem)) {

		nfp_err(pf->cpp, "Failed to map Queue Controller area.\n");

		err = PTR_ERR(mem);

		goto err_unmap_vf_cfg;

		goto err_unmap_vfcfg_tbl2;

	}



	return 0;



err_unmap_vfcfg_tbl2:

	if (pf->vfcfg_tbl2_area)

		nfp_cpp_area_release_free(pf->vfcfg_tbl2_area);

err_unmap_vf_cfg:

	if (pf->vf_cfg_bar)

		nfp_cpp_area_release_free(pf->vf_cfg_bar);