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

Commit 9329b816 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum: Add mlxsw_sp.mac_mask 



The Spectrum hardware demands that all router interfaces in the system
have the same first 38 resp. 36 bits of MAC address: the former limit
holds on Spectrum, the latter on Spectrum-2. Add a field that refers to
the required prefix mask and initialize in mlxsw_sp1_init() and
mlxsw_sp2_init().

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9735f2d2

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

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ static const char mlxsw_sp1_driver_name[] = "mlxsw_spectrum"; 
static const char mlxsw_sp2_driver_name[] = "mlxsw_spectrum2";

static const char mlxsw_sp_driver_version[] = "1.0";



static const unsigned char mlxsw_sp1_mac_mask[ETH_ALEN] = {

	0xff, 0xff, 0xff, 0xff, 0xfc, 0x00

};

static const unsigned char mlxsw_sp2_mac_mask[ETH_ALEN] = {

	0xff, 0xff, 0xff, 0xff, 0xf0, 0x00

};



/* tx_hdr_version

 * Tx header version.

 * Must be set to 1.
@@ -4083,6 +4090,7 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->mr_tcam_ops = &mlxsw_sp1_mr_tcam_ops;

	mlxsw_sp->acl_tcam_ops = &mlxsw_sp1_acl_tcam_ops;

	mlxsw_sp->nve_ops_arr = mlxsw_sp1_nve_ops_arr;

	mlxsw_sp->mac_mask = mlxsw_sp1_mac_mask;



	return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);

}
@@ -4098,6 +4106,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->mr_tcam_ops = &mlxsw_sp2_mr_tcam_ops;

	mlxsw_sp->acl_tcam_ops = &mlxsw_sp2_acl_tcam_ops;

	mlxsw_sp->nve_ops_arr = mlxsw_sp2_nve_ops_arr;

	mlxsw_sp->mac_mask = mlxsw_sp2_mac_mask;



	return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct mlxsw_sp { 
	struct mlxsw_core *core;

	const struct mlxsw_bus_info *bus_info;

	unsigned char base_mac[ETH_ALEN];

	const unsigned char *mac_mask;

	struct mlxsw_sp_upper *lags;

	int *port_to_module;

	struct mlxsw_sp_sb *sb;