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

Merge branch 'nfp-introduce-nfp_port-and-nfp_app' 



Jakub Kicinski says:

====================
nfp: introduce nfp_port and nfp_app

This series builds foundation for upcoming development.  So far the nfp
driver was focused on delivering basic NIC-like functionality.  We want
to switch gears a bit going forward and support more advanced applications.

First few patches are naming clean ups and reshuffling.  The two main
structures this series adds are nfp_port and nfp_app.

nfp_port represents a device port, where port can mean external port,
VF or PF.  For now only external port/MAC/PHY port is added.  nfp_port
is supposed to make it easy to share ethtool and devlink code regardless
of netdev type (full vNIC vs representors).

nfp_app is an abstraction which should allow easier development of new
applications.  So far we have relied fully on port capabilities to detect
which offloads and features are available.  The usual development model
for NFP is that people start with one of our "core NIC" FW apps (C one,
or a macro assembler one) and build advanced functionality on top of that.
Therefore basic netdev code is shared, but the higher-level logic is
usually more project specific.  The higher-level logic is also per-adapter
rather than per-port, so creating per-adapter control entity makes sense.
Hopefully the separation of lower-level netdev code and application logic
will help us limit interdependencies and accelerate parallel projects
(e.g. TC flower offloads vs eBPF offload).

v2:
 - don't hide definition of nfp_app to avoid silly function calls (Dave);
 - reorder kdoc of nfp_main (Simon);
 - make nfp_netdev_is_nfp_net() static inline as well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd080488 1876749d

drivers/net/ethernet/netronome/nfp/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -14,12 +14,14 @@ nfp-objs := \ 
	    nfpcore/nfp_resource.o \

	    nfpcore/nfp_rtsym.o \

	    nfpcore/nfp_target.o \

	    nfp_app.o \

	    nfp_main.o \

	    nfp_net_common.o \

	    nfp_net_ethtool.o \

	    nfp_net_offload.o \

	    nfp_net_main.o \

	    nfp_netvf_main.o

	    nfp_netvf_main.o \

	    nfp_port.o



ifeq ($(CONFIG_BPF_SYSCALL),y)

nfp-objs += \

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

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

 * Copyright (C) 2017 Netronome Systems, Inc.

 *

 * This software is dual licensed under the GNU General License Version 2,

 * June 1991 as shown in the file COPYING in the top-level directory of this

 * source tree or the BSD 2-Clause License provided below.  You have the

 * option to license this software under the complete terms of either license.

 *

 * The BSD 2-Clause License:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      1. Redistributions of source code must retain the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer.

 *

 *      2. Redistributions in binary form must reproduce the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer in the documentation and/or other materials

 *         provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#include <linux/slab.h>



#include "nfp_app.h"

#include "nfp_main.h"



struct nfp_app *nfp_app_alloc(struct nfp_pf *pf)

{

	struct nfp_app *app;



	app = kzalloc(sizeof(*app), GFP_KERNEL);

	if (!app)

		return ERR_PTR(-ENOMEM);



	app->pf = pf;

	app->cpp = pf->cpp;

	app->pdev = pf->pdev;



	return app;

}



void nfp_app_free(struct nfp_app *app)

{

	kfree(app);

}

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

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

 * Copyright (C) 2017 Netronome Systems, Inc.

 *

 * This software is dual licensed under the GNU General License Version 2,

 * June 1991 as shown in the file COPYING in the top-level directory of this

 * source tree or the BSD 2-Clause License provided below.  You have the

 * option to license this software under the complete terms of either license.

 *

 * The BSD 2-Clause License:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      1. Redistributions of source code must retain the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer.

 *

 *      2. Redistributions in binary form must reproduce the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer in the documentation and/or other materials

 *         provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef _NFP_APP_H

#define _NFP_APP_H 1



struct pci_dev;

struct nfp_cpp;

struct nfp_pf;



/**

 * struct nfp_app - NFP application container

 * @pdev:	backpointer to PCI device

 * @pf:		backpointer to NFP PF structure

 * @cpp:	pointer to the CPP handle

 */

struct nfp_app {

	struct pci_dev *pdev;

	struct nfp_pf *pf;

	struct nfp_cpp *cpp;

};



struct nfp_app *nfp_app_alloc(struct nfp_pf *pf);

void nfp_app_free(struct nfp_app *app);



#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
		err = -ENOMEM;

		goto err_rel_regions;

	}

	INIT_LIST_HEAD(&pf->vnics);

	INIT_LIST_HEAD(&pf->ports);

	pci_set_drvdata(pdev, pf);

	pf->pdev = pdev;

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

+15 −10
Original line number Diff line number Diff line
@@ -57,27 +57,31 @@ struct nfp_eth_table; 
 * struct nfp_pf - NFP PF-specific device structure

 * @pdev:		Backpointer to PCI device

 * @cpp:		Pointer to the CPP handle

 * @ctrl_area:		Pointer to the CPP area for the control BAR

 * @app:		Pointer to the APP handle

 * @data_vnic_bar:	Pointer to the CPP area for the data vNICs' BARs

 * @tx_area:		Pointer to the CPP area for the TX queues

 * @rx_area:		Pointer to the CPP area for the FL/RX queues

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

 * @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

 * @fw_loaded:		Is the firmware loaded?

 * @eth_tbl:		NSP ETH table

 * @ddir:		Per-device debugfs directory

 * @num_ports:		Number of adapter ports app firmware supports

 * @num_netdevs:	Number of netdevs spawned

 * @ports:		Linked list of port structures (struct nfp_net)

 * @port_lock:		Protects @ports, @num_ports, @num_netdevs

 * @max_data_vnics:	Number of data vNICs app firmware supports

 * @num_vnics:		Number of vNICs spawned

 * @vnics:		Linked list of vNIC structures (struct nfp_net)

 * @ports:		Linked list of port structures (struct nfp_port)

 * @port_refresh_work:	Work entry for taking netdevs out

 * @lock:		Protects all fields which may change after probe

 */

struct nfp_pf {

	struct pci_dev *pdev;



	struct nfp_cpp *cpp;



	struct nfp_cpp_area *ctrl_area;

	struct nfp_app *app;



	struct nfp_cpp_area *data_vnic_bar;

	struct nfp_cpp_area *tx_area;

	struct nfp_cpp_area *rx_area;
@@ -92,12 +96,13 @@ struct nfp_pf { 


	struct dentry *ddir;



	unsigned int num_ports;

	unsigned int num_netdevs;

	unsigned int max_data_vnics;

	unsigned int num_vnics;



	struct list_head vnics;

	struct list_head ports;

	struct work_struct port_refresh_work;

	struct mutex port_lock;

	struct mutex lock;

};



extern struct pci_driver nfp_netvf_pci_driver;

CRA Git | Maintained and supported by SUSTech CRA and CCSE