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

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

Merge branch 'mlxsw-bridge-vlan-offloading' 



Ido Schimmel says:

====================
This patchset introduces support for the offloading of 802.1D bridges
between VLAN devices. These can either be VLAN devices configured on top
of the physical ports or on top of LAG devices.

Patches 1-2 deal with the necessary infrastructure changes needed in order
to enable the above. The main change is that switchdev drivers can now know
the device from which the switchdev op originated from.

Patches 3-10 lay the groundwork for 802.1D bridges support in the mlxsw
driver, with patch 4 doing most of the heavy lifting.

Patch 11 finally offloads these bridges to hardware by listening to the
notifications sent when the VLAN device joins or leaves a bridge. It is
very similar to the already existing 802.1Q bridge we support.

Patches 12-14 add minor modifications to allow one to bridge a VLAN device
configured on top of LAG.
====================

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 335b3209 272c4470

drivers/net/ethernet/mellanox/mlxsw/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ config MLXSW_SWITCHX2 


config MLXSW_SPECTRUM

	tristate "Mellanox Technologies Spectrum support"

	depends on MLXSW_CORE && NET_SWITCHDEV

	depends on MLXSW_CORE && NET_SWITCHDEV && VLAN_8021Q

	default m

	---help---

	  This driver supports Mellanox Technologies Spectrum Ethernet

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

+15 −7
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static inline void mlxsw_reg_sfd_rec_pack(char *payload, int rec_index, 


static inline void mlxsw_reg_sfd_uc_pack(char *payload, int rec_index,

					 enum mlxsw_reg_sfd_rec_policy policy,

					 const char *mac, u16 vid,

					 const char *mac, u16 fid_vid,

					 enum mlxsw_reg_sfd_rec_action action,

					 u8 local_port)

{
@@ -404,16 +404,16 @@ static inline void mlxsw_reg_sfd_uc_pack(char *payload, int rec_index, 
			       MLXSW_REG_SFD_REC_TYPE_UNICAST,

			       policy, mac, action);

	mlxsw_reg_sfd_uc_sub_port_set(payload, rec_index, 0);

	mlxsw_reg_sfd_uc_fid_vid_set(payload, rec_index, vid);

	mlxsw_reg_sfd_uc_fid_vid_set(payload, rec_index, fid_vid);

	mlxsw_reg_sfd_uc_system_port_set(payload, rec_index, local_port);

}



static inline void mlxsw_reg_sfd_uc_unpack(char *payload, int rec_index,

					   char *mac, u16 *p_vid,

					   char *mac, u16 *p_fid_vid,

					   u8 *p_local_port)

{

	mlxsw_reg_sfd_rec_mac_memcpy_from(payload, rec_index, mac);

	*p_vid = mlxsw_reg_sfd_uc_fid_vid_get(payload, rec_index);

	*p_fid_vid = mlxsw_reg_sfd_uc_fid_vid_get(payload, rec_index);

	*p_local_port = mlxsw_reg_sfd_uc_system_port_get(payload, rec_index);

}
@@ -438,6 +438,13 @@ MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_sub_port, MLXSW_REG_SFD_BASE_LEN, 16, 8, 
MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_fid_vid, MLXSW_REG_SFD_BASE_LEN, 0, 16,

		     MLXSW_REG_SFD_REC_LEN, 0x08, false);



/* reg_sfd_uc_lag_lag_vid

 * Indicates VID in case of vFIDs. Reserved for FIDs.

 * Access: RW

 */

MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_lag_vid, MLXSW_REG_SFD_BASE_LEN, 16, 12,

		     MLXSW_REG_SFD_REC_LEN, 0x0C, false);



/* reg_sfd_uc_lag_lag_id

 * LAG Identifier - pointer into the LAG descriptor table.

 * Access: RW
@@ -448,15 +455,16 @@ MLXSW_ITEM32_INDEXED(reg, sfd, uc_lag_lag_id, MLXSW_REG_SFD_BASE_LEN, 0, 10, 
static inline void

mlxsw_reg_sfd_uc_lag_pack(char *payload, int rec_index,

			  enum mlxsw_reg_sfd_rec_policy policy,

			  const char *mac, u16 vid,

			  enum mlxsw_reg_sfd_rec_action action,

			  const char *mac, u16 fid_vid,

			  enum mlxsw_reg_sfd_rec_action action, u16 lag_vid,

			  u16 lag_id)

{

	mlxsw_reg_sfd_rec_pack(payload, rec_index,

			       MLXSW_REG_SFD_REC_TYPE_UNICAST_LAG,

			       policy, mac, action);

	mlxsw_reg_sfd_uc_lag_sub_port_set(payload, rec_index, 0);

	mlxsw_reg_sfd_uc_lag_fid_vid_set(payload, rec_index, vid);

	mlxsw_reg_sfd_uc_lag_fid_vid_set(payload, rec_index, fid_vid);

	mlxsw_reg_sfd_uc_lag_lag_vid_set(payload, rec_index, lag_vid);

	mlxsw_reg_sfd_uc_lag_lag_id_set(payload, rec_index, lag_id);

}