Commit cfcbe858 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw' 



Jiri Pirko says:

====================
Introduce Mellanox Technologies Switch ASICs switchdev drivers

This patchset introduces Mellanox Technologies Switch driver infrastructure
and support for SwitchX-2 ASIC.

The driver is divided into 3 logical parts:
1) Bus - implements switch bus interface. Currently only PCI bus is
   implemented, but more buses will be added in the future. Namely I2C
   and SGMII.
   (patch #2)
2) Driver - implemements of ASIC-specific functions.
   Currently SwitchX-2 ASIC is supported, but a plan exists to introduce
   support for Spectrum ASIC in the near future.
   (patch #4)
3) Core - infrastructure that glues buses and drivers together.
   It implements register access logic (EMADs) and takes care of RX traps
   and events.
   (patch #1 and #3)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8670f2a5 31557f0f

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -6645,6 +6645,15 @@ W: http://www.mellanox.com 
Q:	http://patchwork.ozlabs.org/project/netdev/list/

F:	drivers/net/ethernet/mellanox/mlx4/en_*



MELLANOX ETHERNET SWITCH DRIVERS

M:	Jiri Pirko <jiri@mellanox.com>

M:	Ido Schimmel <idosch@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com

Q:	http://patchwork.ozlabs.org/project/netdev/list/

F:	drivers/net/ethernet/mellanox/mlxsw/



MEMORY MANAGEMENT

L:	linux-mm@kvack.org

W:	http://www.linux-mm.org

drivers/net/ethernet/mellanox/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ if NET_VENDOR_MELLANOX 


source "drivers/net/ethernet/mellanox/mlx4/Kconfig"

source "drivers/net/ethernet/mellanox/mlx5/core/Kconfig"

source "drivers/net/ethernet/mellanox/mlxsw/Kconfig"



endif # NET_VENDOR_MELLANOX

drivers/net/ethernet/mellanox/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 


obj-$(CONFIG_MLX4_CORE) += mlx4/

obj-$(CONFIG_MLX5_CORE) += mlx5/core/

obj-$(CONFIG_MLXSW_CORE) += mlxsw/

drivers/net/ethernet/mellanox/mlxsw/Kconfig

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#

# Mellanox switch drivers configuration

#



config MLXSW_CORE

	tristate "Mellanox Technologies Switch ASICs support"

	---help---

	  This driver supports Mellanox Technologies Switch ASICs family.



	  To compile this driver as a module, choose M here: the

	  module will be called mlxsw_core.



config MLXSW_PCI

	tristate "PCI bus implementation for Mellanox Technologies Switch ASICs"

	depends on PCI && MLXSW_CORE

	default m

	---help---

	  This is PCI bus implementation for Mellanox Technologies Switch ASICs.



	  To compile this driver as a module, choose M here: the

	  module will be called mlxsw_pci.



config MLXSW_SWITCHX2

	tristate "Mellanox Technologies SwitchX-2 support"

	depends on MLXSW_CORE && NET_SWITCHDEV

	default m

	---help---

	  This driver supports Mellanox Technologies SwitchX-2 Ethernet

	  Switch ASICs.



	  To compile this driver as a module, choose M here: the

	  module will be called mlxsw_switchx2.

drivers/net/ethernet/mellanox/mlxsw/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MLXSW_CORE)	+= mlxsw_core.o

mlxsw_core-objs			:= core.o

obj-$(CONFIG_MLXSW_PCI)		+= mlxsw_pci.o

mlxsw_pci-objs			:= pci.o

obj-$(CONFIG_MLXSW_SWITCHX2)	+= mlxsw_switchx2.o

mlxsw_switchx2-objs		:= switchx2.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE