-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: Jakub Kicinski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
8 changed files
with
160 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ | |
| # Makefile for the Netronome network device drivers | ||
| # | ||
|
|
||
| obj-$(CONFIG_NFP_NETVF) += nfp/ | ||
| obj-$(CONFIG_NFP) += nfp/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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 <[email protected]> | ||
| * Alejandro Lucero <[email protected]> | ||
| * Jason McMullan <[email protected]> | ||
| * Rolf Neugebauer <[email protected]> | ||
| */ | ||
|
|
||
| #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 <[email protected]>"); | ||
| MODULE_LICENSE("GPL"); | ||
| MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver."); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * 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 <[email protected]> | ||
| */ | ||
|
|
||
| #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 */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * Copyright (C) 2015 Netronome Systems, Inc. | ||
| * 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 | ||
|
|
@@ -46,8 +46,8 @@ | |
| #include "nfp_net_ctrl.h" | ||
| #include "nfp_net.h" | ||
|
|
||
| const char nfp_net_driver_name[] = "nfp_netvf"; | ||
| const char nfp_net_driver_version[] = "0.1"; | ||
| static const char nfp_net_driver_name[] = "nfp_netvf"; | ||
|
|
||
| #define PCI_DEVICE_NFP6000VF 0x6003 | ||
| static const struct pci_device_id nfp_netvf_pci_device_ids[] = { | ||
| { PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_NFP6000VF, | ||
|
|
@@ -315,39 +315,9 @@ static void nfp_netvf_pci_remove(struct pci_dev *pdev) | |
| pci_disable_device(pdev); | ||
| } | ||
|
|
||
| static struct pci_driver nfp_netvf_pci_driver = { | ||
| struct pci_driver nfp_netvf_pci_driver = { | ||
| .name = nfp_net_driver_name, | ||
| .id_table = nfp_netvf_pci_device_ids, | ||
| .probe = nfp_netvf_pci_probe, | ||
| .remove = nfp_netvf_pci_remove, | ||
| }; | ||
|
|
||
| static int __init nfp_netvf_init(void) | ||
| { | ||
| int err; | ||
|
|
||
| pr_info("%s: NFP VF Network driver, Copyright (C) 2014-2015 Netronome Systems\n", | ||
| nfp_net_driver_name); | ||
|
|
||
| nfp_net_debugfs_create(); | ||
| err = pci_register_driver(&nfp_netvf_pci_driver); | ||
| if (err) { | ||
| nfp_net_debugfs_destroy(); | ||
| return err; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static void __exit nfp_netvf_exit(void) | ||
| { | ||
| pci_unregister_driver(&nfp_netvf_pci_driver); | ||
| nfp_net_debugfs_destroy(); | ||
| } | ||
|
|
||
| module_init(nfp_netvf_init); | ||
| module_exit(nfp_netvf_exit); | ||
|
|
||
| MODULE_AUTHOR("Netronome Systems <[email protected]>"); | ||
| MODULE_LICENSE("GPL"); | ||
| MODULE_DESCRIPTION("NFP VF network device driver"); | ||