Re: [PATCH v2 5/9] thunderbolt: Update Kconfig entries to USB4

[Nicholas Johnson]

On Tue, Dec 17, 2019 at 03:33:41PM +0300, Mika Westerberg wrote:
> Since the driver now supports USB4 which is the standard going forward,
> update the Kconfig entry to mention this and rename the entry from
> CONFIG_THUNDERBOLT to CONFIG_USB4 instead to help people to find the
> correct option if they want to enable USB4.
> 
> Also do the same for Thunderbolt network driver.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
> ---
>  drivers/Makefile             |  2 +-
>  drivers/net/Kconfig          | 10 +++++-----
>  drivers/net/Makefile         |  2 +-
>  drivers/thunderbolt/Kconfig  | 11 ++++++-----
>  drivers/thunderbolt/Makefile |  2 +-
>  5 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/Makefile b/drivers/Makefile
> index aaef17cc6512..31cf17dee252 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -171,7 +171,7 @@ obj-$(CONFIG_POWERCAP)		+= powercap/
>  obj-$(CONFIG_MCB)		+= mcb/
>  obj-$(CONFIG_PERF_EVENTS)	+= perf/
>  obj-$(CONFIG_RAS)		+= ras/
> -obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/
> +obj-$(CONFIG_USB4)		+= thunderbolt/
>  obj-$(CONFIG_CORESIGHT)		+= hwtracing/coresight/
>  obj-y				+= hwtracing/intel_th/
>  obj-$(CONFIG_STM)		+= hwtracing/stm/
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index d02f12a5254e..d1c84d47779d 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -489,12 +489,12 @@ config FUJITSU_ES
>  	  This driver provides support for Extended Socket network device
>  	  on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.
>  
> -config THUNDERBOLT_NET
> -	tristate "Networking over Thunderbolt cable"
> -	depends on THUNDERBOLT && INET
> +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 Thunderbolt cable. The driver supports Apple
> +	  Select this if you want to create network between two computers
> +	  over a USB4 and Thunderbolt cables. The driver supports Apple
Nitpick: Perhaps should be "over USB4 and Thunderbolt cables".

>  	  ThunderboltIP protocol and allows communication with any host
>  	  supporting the same protocol including Windows and macOS.
>  
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 0d3ba056cda3..29e83e9f545e 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -76,6 +76,6 @@ obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
>  obj-$(CONFIG_FUJITSU_ES) += fjes/
>  
>  thunderbolt-net-y += thunderbolt.o
> -obj-$(CONFIG_THUNDERBOLT_NET) += thunderbolt-net.o
> +obj-$(CONFIG_USB4_NET) += thunderbolt-net.o
>  obj-$(CONFIG_NETDEVSIM) += netdevsim/
>  obj-$(CONFIG_NET_FAILOVER) += net_failover.o
> diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
> index fd9adca898ff..1eb757e8df3b 100644
> --- a/drivers/thunderbolt/Kconfig
> +++ b/drivers/thunderbolt/Kconfig
> @@ -1,6 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> -menuconfig THUNDERBOLT
> -	tristate "Thunderbolt support"
> +menuconfig USB4
> +	tristate "Unified support for USB4 and Thunderbolt"
>  	depends on PCI
>  	depends on X86 || COMPILE_TEST
>  	select APPLE_PROPERTIES if EFI_STUB && X86
> @@ -9,9 +9,10 @@ menuconfig THUNDERBOLT
>  	select CRYPTO_HASH
>  	select NVMEM
>  	help
> -	  Thunderbolt Controller driver. This driver is required if you
> -	  want to hotplug Thunderbolt devices on Apple hardware or on PCs
> -	  with Intel Falcon Ridge or newer.
> +	  USB4 and Thunderbolt driver. USB4 is the public speficiation
> +	  based on Thunderbolt 3 protocol. This driver is required if
> +	  you want to hotplug Thunderbolt and USB4 compliant devices on
> +	  Apple hardware or on PCs with Intel Falcon Ridge or newer.
>  
>  	  To compile this driver a module, choose M here. The module will be
>  	  called thunderbolt.
> diff --git a/drivers/thunderbolt/Makefile b/drivers/thunderbolt/Makefile
> index c0b2fd73dfbd..102e9529ee66 100644
> --- a/drivers/thunderbolt/Makefile
> +++ b/drivers/thunderbolt/Makefile
> @@ -1,4 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> -obj-${CONFIG_THUNDERBOLT} := thunderbolt.o
> +obj-${CONFIG_USB4} := thunderbolt.o
>  thunderbolt-objs := nhi.o nhi_ops.o ctl.o tb.o switch.o cap.o path.o tunnel.o eeprom.o
>  thunderbolt-objs += domain.o dma_port.o icm.o property.o xdomain.o lc.o usb4.o
> -- 
> 2.24.0
> 

Kind regards,
Nicholas