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

Commit 7ac9ebd5 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: introduce very minimal nfp_app 



Introduce a concept of an application.  For now it's just grouping
pointers and serving as a layer of indirection.  It will help us
weaken the dependency on nfp_net in ethtool code.  Later series
will flesh out support for different apps in the driver.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9140b30d

drivers/net/ethernet/netronome/nfp/Makefile

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

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.h

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct nfp_eth_table; 
 * struct nfp_pf - NFP PF-specific device structure

 * @pdev:		Backpointer to PCI device

 * @cpp:		Pointer to the CPP handle

 * @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
@@ -77,6 +78,8 @@ struct nfp_pf { 


	struct nfp_cpp *cpp;



	struct nfp_app *app;



	struct nfp_cpp_area *data_vnic_bar;

	struct nfp_cpp_area *tx_area;

	struct nfp_cpp_area *rx_area;

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

+2 −2
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ struct nfp_net_dp { 
 * @ethtool_dump_flag:	Ethtool dump flag

 * @vnic_list:		Entry on device vNIC list

 * @pdev:		Backpointer to PCI device

 * @cpp:		CPP device handle if available

 * @app:		APP handle if available

 * @eth_port:		Translated ETH Table port entry

 */

struct nfp_net {
@@ -628,7 +628,7 @@ struct nfp_net { 
	struct list_head vnic_list;



	struct pci_dev *pdev;

	struct nfp_cpp *cpp;

	struct nfp_app *app;



	struct nfp_eth_table_port *eth_port;

};