Skip to content

Commit 1bb1c5b

Browse files
committed
Merge branch 'FFungible-ethernet-driver'
Dimitris Michailidis says: ==================== new Fungible Ethernet driver This patch series contains a new network driver for the Ethernet functionality of Fungible cards. It contains two modules. The first one in patch 2 is a library module that implements some of the device setup, queue managenent, and support for operating an admin queue. These are placed in a separate module because the cards provide a number of PCI functions handled by different types of drivers and all use the same common means to interact with the device. Each of the drivers will be relying on this library module for them. The remaining patches provide the Ethernet driver for the cards. v2: - Fix set_pauseparam, remove get_wol, remove module param (Andrew Lunn) - Fix a register poll loop (Andrew) - Replace constants defined with 'static const' - make W=1 C=1 is clean - Remove devlink FW update (Jakub) - Remove duplicate ethtool stats covered by structured API (Jakub) v3: - Make TLS stats unconditional (Andrew) - Remove inline from .c (Andrew) - Replace some ifdef with IS_ENABLED (Andrew) - Fix build failure on 32b arches (build robot) - Fix build issue with make O= (Jakub) v4: - Fix for newer bpf_warn_invalid_xdp_action() (Jakub) - Remove 32b dma_set_mask_and_coherent() v5: - Make XDP enter/exit non-disruptive to active traffic - Remove dormant port state - Style fixes, unused stuff removal (Jakub) v6: - When changing queue depth or numbers allocate the new queues before shutting down the existing ones (Jakub) v7: - Convert IRQ bookeeping to use XArray. - Changes to the numbers of Tx/Rx queues are now incremental and do not disrupt ongoing traffic. - Implement .ndo_eth_ioctl instead of .ndo_do_ioctl. - Replace deprecated irq_set_affinity_hint. - Remove TLS 1.3 support (Jakub) - Remove hwtstamp_config.flags check (Jakub) - Add locking in SR-IOV enable/disable. (Jakub) v8: - Remove dropping of <33B packets and the associated counter (Jakub) - Report CQE size. - Show last MAC stats when the netdev isn't running (Andrew) ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 4aaa489 + 749efb1 commit 1bb1c5b

26 files changed

+8776
-0
lines changed

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7931,6 +7931,12 @@ L: [email protected]
79317931
S: Maintained
79327932
F: drivers/platform/x86/fujitsu-tablet.c
79337933

7934+
FUNGIBLE ETHERNET DRIVERS
7935+
M: Dimitris Michailidis <[email protected]>
7936+
7937+
S: Supported
7938+
F: drivers/net/ethernet/fungible/
7939+
79347940
FUSE: FILESYSTEM IN USERSPACE
79357941
M: Miklos Szeredi <[email protected]>
79367942

drivers/net/ethernet/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ source "drivers/net/ethernet/ezchip/Kconfig"
7878
source "drivers/net/ethernet/faraday/Kconfig"
7979
source "drivers/net/ethernet/freescale/Kconfig"
8080
source "drivers/net/ethernet/fujitsu/Kconfig"
81+
source "drivers/net/ethernet/fungible/Kconfig"
8182
source "drivers/net/ethernet/google/Kconfig"
8283
source "drivers/net/ethernet/hisilicon/Kconfig"
8384
source "drivers/net/ethernet/huawei/Kconfig"

drivers/net/ethernet/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ obj-$(CONFIG_NET_VENDOR_EZCHIP) += ezchip/
4141
obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
4242
obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
4343
obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/
44+
obj-$(CONFIG_NET_VENDOR_FUNGIBLE) += fungible/
4445
obj-$(CONFIG_NET_VENDOR_GOOGLE) += google/
4546
obj-$(CONFIG_NET_VENDOR_HISILICON) += hisilicon/
4647
obj-$(CONFIG_NET_VENDOR_HUAWEI) += huawei/

drivers/net/ethernet/fungible/Kconfig

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
#
3+
# Fungible network driver configuration
4+
#
5+
6+
config NET_VENDOR_FUNGIBLE
7+
bool "Fungible devices"
8+
default y
9+
help
10+
If you have a Fungible network device, say Y.
11+
12+
Note that the answer to this question doesn't directly affect the
13+
kernel: saying N will just cause the configurator to skip all
14+
the questions about Fungible cards. If you say Y, you will be asked
15+
for your specific card in the following questions.
16+
17+
if NET_VENDOR_FUNGIBLE
18+
19+
config FUN_CORE
20+
tristate
21+
help
22+
A service module offering basic common services to Fungible
23+
device drivers.
24+
25+
source "drivers/net/ethernet/fungible/funeth/Kconfig"
26+
27+
endif # NET_VENDOR_FUNGIBLE
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
2+
#
3+
# Makefile for the Fungible network device drivers.
4+
#
5+
6+
obj-$(CONFIG_FUN_CORE) += funcore/
7+
obj-$(CONFIG_FUN_ETH) += funeth/
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
2+
3+
obj-$(CONFIG_FUN_CORE) += funcore.o
4+
5+
funcore-y := fun_dev.o fun_queue.o

0 commit comments

Comments
 (0)