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

Commit 2633beb9 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: rename the driver and add new main file 



Support for the PF driver is about to be added and will share
much of the code.  When the VF driver was added we planned to
maintain the PF driver as a separate module but have decided
that for our simple use case just maintaining a single module
is more reasonable.  Rename the driver to just "nfp" and update
the Kconfig.

While at it remove latent references to NFP3200.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1697599e

drivers/net/ethernet/netronome/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -15,21 +15,21 @@ config NET_VENDOR_NETRONOME 


if NET_VENDOR_NETRONOME



config NFP_NETVF

	tristate "Netronome(R) NFP4000/NFP6000 VF NIC driver"

config NFP

	tristate "Netronome(R) NFP4000/NFP6000 NIC driver"

	depends on PCI && PCI_MSI

	depends on VXLAN || VXLAN=n

	---help---

	  This driver supports SR-IOV virtual functions of

	  the Netronome(R) NFP4000/NFP6000 cards working as

	  a advanced Ethernet NIC.

	  This driver supports the Netronome(R) NFP4000/NFP6000 based

	  cards working as a advanced Ethernet NIC.  It works with both

	  SR-IOV physical and virtual functions.



config NFP_NET_DEBUG

	bool "Debug support for Netronome(R) NFP3200/NFP6000 NIC drivers"

	depends on NFP_NET || NFP_NETVF

config NFP_DEBUG

	bool "Debug support for Netronome(R) NFP4000/NFP6000 NIC drivers"

	depends on NFP

	---help---

	  Enable extra sanity checks and debugfs support in

	  Netronome(R) NFP3200/NFP6000 NIC PF and VF drivers.

	  Netronome(R) NFP4000/NFP6000 NIC drivers.

	  Note: selecting this option may adversely impact

		performance.

drivers/net/ethernet/netronome/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# Makefile for the Netronome network device drivers

#



obj-$(CONFIG_NFP_NETVF) += nfp/
 
obj-$(CONFIG_NFP) += nfp/

drivers/net/ethernet/netronome/nfp/Makefile

+5 −4
Original line number Diff line number Diff line 
obj-$(CONFIG_NFP_NETVF)	+= nfp_netvf.o

obj-$(CONFIG_NFP)	+= nfp.o



nfp_netvf-objs := \

nfp-objs := \

	    nfp_main.o \

	    nfp_net_common.o \

	    nfp_net_ethtool.o \

	    nfp_net_offload.o \

	    nfp_netvf_main.o



ifeq ($(CONFIG_BPF_SYSCALL),y)

nfp_netvf-objs += \

nfp-objs += \

	    nfp_bpf_verifier.o \

	    nfp_bpf_jit.o

endif



nfp_netvf-$(CONFIG_NFP_NET_DEBUG) += nfp_net_debugfs.o
 
nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o

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

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

 * Copyright (C) 2015-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.

 */



/*

 * nfp_main.c

 * Authors: Jakub Kicinski <jakub.kicinski@netronome.com>

 *          Alejandro Lucero <alejandro.lucero@netronome.com>

 *          Jason McMullan <jason.mcmullan@netronome.com>

 *          Rolf Neugebauer <rolf.neugebauer@netronome.com>

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/firmware.h>

#include <linux/vermagic.h>



#include "nfp_main.h"

#include "nfp_net.h"



static const char nfp_driver_name[] = "nfp";

const char nfp_driver_version[] = VERMAGIC_STRING;



static int __init nfp_main_init(void)

{

	int err;



	pr_info("%s: NFP PCIe Driver, Copyright (C) 2014-2017 Netronome Systems\n",

		nfp_driver_name);



	nfp_net_debugfs_create();



	err = pci_register_driver(&nfp_netvf_pci_driver);

	if (err)

		goto err_destroy_debugfs;



	return err;



err_destroy_debugfs:

	nfp_net_debugfs_destroy();

	return err;

}



static void __exit nfp_main_exit(void)

{

	pci_unregister_driver(&nfp_netvf_pci_driver);

	nfp_net_debugfs_destroy();

}



module_init(nfp_main_init);

module_exit(nfp_main_exit);



MODULE_AUTHOR("Netronome Systems <oss-drivers@netronome.com>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");

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

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

 * Copyright (C) 2015-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.

 */



/*

 * nfp_main.h

 * Author: Jason McMullan <jason.mcmullan@netronome.com>

 */



#ifndef NFP_MAIN_H

#define NFP_MAIN_H



#include <linux/types.h>

#include <linux/msi.h>

#include <linux/pci.h>



extern struct pci_driver nfp_netvf_pci_driver;



#endif /* NFP_MAIN_H */