Commit 296403f9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-thunderbolt-add-tracepoints' 

Mika Westerberg says:

====================
net: thunderbolt: Add tracepoints

This series adds tracepoints and additional logging to the
Thunderbolt/USB4 networking driver. These are useful when debugging
possible issues.

Before that we move the driver into its own directory under drivers/net
so that we can add additional files without trashing the network drivers
main directory, and update the MAINTAINERS accordingly.

v1: https://lore.kernel.org/netdev/20230104081731.45928-1-mika.westerberg@linux.intel.com/
====================

Link: https://lore.kernel.org/r/20230111062633.1385-1-mika.westerberg@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents dec5efcf f7586527

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -20789,7 +20789,7 @@ M: Mika Westerberg <mika.westerberg@linux.intel.com> 
M:	Yehezkel Bernat <YehezkelShB@gmail.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/thunderbolt.c

F:	drivers/net/thunderbolt/









THUNDERX GPIO DRIVER









M:	Robert Richter <rric@kernel.org>

























drivers/net/Kconfig



+1
−12






























Original line number
Diff line number
Diff line







@@ -583,18 +583,7 @@ config FUJITSU_ES







	  This driver provides support for Extended Socket network device









	  on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.



















config USB4_NET









	tristate "Networking over USB4 and Thunderbolt cables"









	depends on USB4 && INET









	help









	  Select this if you want to create network between two computers









	  over a USB4 and Thunderbolt cables. The driver supports Apple









	  ThunderboltIP protocol and allows communication with any host









	  supporting the same protocol including Windows and macOS.



















	  To compile this driver a module, choose M here. The module will be









	  called thunderbolt-net.



















source "drivers/net/thunderbolt/Kconfig"









source "drivers/net/hyperv/Kconfig"



















config NETDEVSIM
































drivers/net/Makefile



+1
−3






























Original line number
Diff line number
Diff line







@@ -84,8 +84,6 @@ obj-$(CONFIG_HYPERV_NET) += hyperv/







obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o



















obj-$(CONFIG_FUJITSU_ES) += fjes/



















thunderbolt-net-y += thunderbolt.o









obj-$(CONFIG_USB4_NET) += thunderbolt-net.o









obj-$(CONFIG_USB4_NET) += thunderbolt/









obj-$(CONFIG_NETDEVSIM) += netdevsim/









obj-$(CONFIG_NET_FAILOVER) += net_failover.o
























drivers/net/thunderbolt/Kconfig
0 → 100644



+12
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









config USB4_NET









	tristate "Networking over USB4 and Thunderbolt cables"









	depends on USB4 && INET









	help









	  Select this if you want to create network between two computers









	  over a USB4 and Thunderbolt cables. The driver supports Apple









	  ThunderboltIP protocol and allows communication with any host









	  supporting the same protocol including Windows and macOS.



















	  To compile this driver a module, choose M here. The module will be









	  called thunderbolt_net.
























drivers/net/thunderbolt/Makefile
0 → 100644



+6
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









obj-$(CONFIG_USB4_NET) := thunderbolt_net.o









thunderbolt_net-objs := main.o trace.o



















# Tracepoints need to know where to find trace.h









CFLAGS_trace.o := -I$(src)