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

Merge branch 'mlxsw-next' 



Ido Schimmel says:

====================
mlxsw: Various updates

This patchset contains various updates to the mlxsw driver and related
selftests.

Patches #1-#5 contain various updates to mlxsw selftests. The most
significant change is the conversion of the DCB selftests to use the new
iproute2 DCB support.

Patches #6-#9 contain mostly trivial changes to the driver itself. No
user facing changes.

Patches #10-#11 remove support for SwitchX-2 and SwitchIB ASICs that did
not see any updates in the last 4-5 years and will not see any in the
future. See individual commit messages for detailed explanation as to
why it is OK to remove these drivers from the kernel.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 16145dbd b0d80c01

drivers/net/ethernet/mellanox/mlxsw/Kconfig

+0 −22
Original line number Diff line number Diff line
@@ -49,28 +49,6 @@ config MLXSW_I2C 
	  To compile this driver as a module, choose M here: the

	  module will be called mlxsw_i2c.



config MLXSW_SWITCHIB

	tristate "Mellanox Technologies SwitchIB and SwitchIB-2 support"

	depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV

	default m

	help

	  This driver supports Mellanox Technologies SwitchIB and SwitchIB-2

	  Infiniband Switch ASICs.



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

	  module will be called mlxsw_switchib.



config MLXSW_SWITCHX2

	tristate "Mellanox Technologies SwitchX-2 support"

	depends on MLXSW_CORE && MLXSW_PCI && 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.



config MLXSW_SPECTRUM

	tristate "Mellanox Technologies Spectrum family support"

	depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV && VLAN_8021Q

drivers/net/ethernet/mellanox/mlxsw/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ obj-$(CONFIG_MLXSW_PCI) += mlxsw_pci.o 
mlxsw_pci-objs			:= pci.o

obj-$(CONFIG_MLXSW_I2C)		+= mlxsw_i2c.o

mlxsw_i2c-objs			:= i2c.o

obj-$(CONFIG_MLXSW_SWITCHIB)	+= mlxsw_switchib.o

mlxsw_switchib-objs		:= switchib.o

obj-$(CONFIG_MLXSW_SWITCHX2)	+= mlxsw_switchx2.o

mlxsw_switchx2-objs		:= switchx2.o

obj-$(CONFIG_MLXSW_SPECTRUM)	+= mlxsw_spectrum.o

mlxsw_spectrum-objs		:= spectrum.o spectrum_buffers.o \

				   spectrum_switchdev.o spectrum_router.o \

drivers/net/ethernet/mellanox/mlxsw/core.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int mlxsw_emad_transmit(struct mlxsw_core *mlxsw_core, 
	struct sk_buff *skb;

	int err;



	skb = skb_copy(trans->tx_skb, GFP_KERNEL);

	skb = skb_clone(trans->tx_skb, GFP_KERNEL);

	if (!skb)

		return -ENOMEM;

drivers/net/ethernet/mellanox/mlxsw/ib.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */

/* Copyright (c) 2016-2018 Mellanox Technologies. All rights reserved */



#ifndef _MLXSW_IB_H

#define _MLXSW_IB_H



#define MLXSW_IB_DEFAULT_MTU 4096



#endif /* _MLXSW_IB_H */

drivers/net/ethernet/mellanox/mlxsw/minimal.c

+4 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static void mlxsw_m_port_remove(struct mlxsw_m *mlxsw_m, u8 local_port) 
static int mlxsw_m_port_module_map(struct mlxsw_m *mlxsw_m, u8 local_port,

				   u8 *last_module)

{

	unsigned int max_ports = mlxsw_core_max_ports(mlxsw_m->core);

	u8 module, width;

	int err;
@@ -249,6 +250,9 @@ static int mlxsw_m_port_module_map(struct mlxsw_m *mlxsw_m, u8 local_port, 
	if (module == *last_module)

		return 0;

	*last_module = module;



	if (WARN_ON_ONCE(module >= max_ports))

		return -EINVAL;

	mlxsw_m->module_to_port[module] = ++mlxsw_m->max_ports;



	return 0;