Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'mlxsw-spectrum' 



Jiri Pirko says:

====================
mlxsw: Driver update, add initial support for Spectrum ASIC

Purpose of this patchset is to introduce initial support for Mellanox
Spectrum ASIC, including L2 bridge forwarding offload.

The only non-mlxsw patch in this patchset is the first one, introducing
pre-change upper notifier. That is used in last patch to ensure ports of
single ASIC are not bridged into multiple bridges, as that scenario is
currently not supported by driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 125ecf4b 56ade8fe

drivers/net/ethernet/mellanox/mlxsw/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -30,3 +30,14 @@ config MLXSW_SWITCHX2 


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

	  module will be called mlxsw_switchx2.



config MLXSW_SPECTRUM

	tristate "Mellanox Technologies Spectrum support"

	depends on MLXSW_CORE && NET_SWITCHDEV

	default m

	---help---

	  This driver supports Mellanox Technologies Spectrum Ethernet

	  Switch ASICs.



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

	  module will be called mlxsw_spectrum.

drivers/net/ethernet/mellanox/mlxsw/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4,3 +4,6 @@ obj-$(CONFIG_MLXSW_PCI) += mlxsw_pci.o 
mlxsw_pci-objs			:= pci.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

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

+25 −0
Original line number Diff line number Diff line
@@ -674,6 +674,31 @@ MLXSW_ITEM32(cmd_mbox, config_profile, max_vid_flood_tables, 0x30, 8, 4); 
 */

MLXSW_ITEM32(cmd_mbox, config_profile, flood_mode, 0x30, 0, 2);



/* cmd_mbox_config_profile_max_fid_offset_flood_tables

 * Maximum number of FID-offset flooding tables.

 */

MLXSW_ITEM32(cmd_mbox, config_profile,

	     max_fid_offset_flood_tables, 0x34, 24, 4);



/* cmd_mbox_config_profile_fid_offset_flood_table_size

 * The size (number of entries) of each FID-offset flood table.

 */

MLXSW_ITEM32(cmd_mbox, config_profile,

	     fid_offset_flood_table_size, 0x34, 0, 16);



/* cmd_mbox_config_profile_max_fid_flood_tables

 * Maximum number of per-FID flooding tables.

 *

 * Note: This flooding tables cover special FIDs only (vFIDs), starting at

 * FID value 4K and higher.

 */

MLXSW_ITEM32(cmd_mbox, config_profile, max_fid_flood_tables, 0x38, 24, 4);



/* cmd_mbox_config_profile_fid_flood_table_size

 * The size (number of entries) of each per-FID table.

 */

MLXSW_ITEM32(cmd_mbox, config_profile, fid_flood_table_size, 0x38, 0, 16);



/* cmd_mbox_config_profile_max_ib_mc

 * Maximum number of multicast FDB records for InfiniBand

 * FDB (in 512 chunks) per InfiniBand switch partition.

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

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
	MODULE_ALIAS(MLXSW_MODULE_ALIAS_PREFIX kind)



#define MLXSW_DEVICE_KIND_SWITCHX2 "switchx2"

#define MLXSW_DEVICE_KIND_SPECTRUM "spectrum"



struct mlxsw_core;

struct mlxsw_driver;
@@ -153,6 +154,10 @@ struct mlxsw_config_profile { 
	u8	max_flood_tables;

	u8	max_vid_flood_tables;

	u8	flood_mode;

	u8	max_fid_offset_flood_tables;

	u16	fid_offset_flood_table_size;

	u8	max_fid_flood_tables;

	u16	fid_flood_table_size;

	u16	max_ib_mc;

	u16	max_pkey;

	u8	ar_sec;

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

+42 −8
Original line number Diff line number Diff line
@@ -171,15 +171,21 @@ static inline void __mlxsw_item_set64(char *buf, struct mlxsw_item *item, 
}



static inline void __mlxsw_item_memcpy_from(char *buf, char *dst,

					    struct mlxsw_item *item)

					    struct mlxsw_item *item,

					    unsigned short index)

{

	memcpy(dst, &buf[item->offset], item->size.bytes);

	unsigned int offset = __mlxsw_item_offset(item, index, sizeof(char));



	memcpy(dst, &buf[offset], item->size.bytes);

}



static inline void __mlxsw_item_memcpy_to(char *buf, char *src,

					  struct mlxsw_item *item)

static inline void __mlxsw_item_memcpy_to(char *buf, const char *src,

					  struct mlxsw_item *item,

					  unsigned short index)

{

	memcpy(&buf[item->offset], src, item->size.bytes);

	unsigned int offset = __mlxsw_item_offset(item, index, sizeof(char));



	memcpy(&buf[offset], src, item->size.bytes);

}



static inline u16
@@ -371,12 +377,40 @@ static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = { \ 
static inline void								\

mlxsw_##_type##_##_cname##_##_iname##_memcpy_from(char *buf, char *dst)		\

{										\

	__mlxsw_item_memcpy_from(buf, dst, &__ITEM_NAME(_type, _cname, _iname));\

	__mlxsw_item_memcpy_from(buf, dst,					\

				 &__ITEM_NAME(_type, _cname, _iname), 0);	\

}										\

static inline void								\

mlxsw_##_type##_##_cname##_##_iname##_memcpy_to(char *buf, const char *src)	\

{										\

	__mlxsw_item_memcpy_to(buf, src,					\

			       &__ITEM_NAME(_type, _cname, _iname), 0);		\

}



#define MLXSW_ITEM_BUF_INDEXED(_type, _cname, _iname, _offset, _sizebytes,	\

			       _step, _instepoffset)				\

static struct mlxsw_item __ITEM_NAME(_type, _cname, _iname) = {			\

	.offset = _offset,							\

	.step = _step,								\

	.in_step_offset = _instepoffset,					\

	.size = {.bytes = _sizebytes,},						\

	.name = #_type "_" #_cname "_" #_iname,					\

};										\

static inline void								\

mlxsw_##_type##_##_cname##_##_iname##_memcpy_from(char *buf,			\

						  unsigned short index,		\

						  char *dst)			\

{										\

	__mlxsw_item_memcpy_from(buf, dst,					\

				 &__ITEM_NAME(_type, _cname, _iname), index);	\

}										\

static inline void								\

mlxsw_##_type##_##_cname##_##_iname##_memcpy_to(char *buf, char *src)		\

mlxsw_##_type##_##_cname##_##_iname##_memcpy_to(char *buf,			\

						unsigned short index,		\

						const char *src)		\

{										\

	__mlxsw_item_memcpy_to(buf, src, &__ITEM_NAME(_type, _cname, _iname));	\

	__mlxsw_item_memcpy_to(buf, src,					\

			       &__ITEM_NAME(_type, _cname, _iname), index);	\

}



#define MLXSW_ITEM_BIT_ARRAY(_type, _cname, _iname, _offset, _sizebytes,	\