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

Commit 262e1ff9 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Set PVID during port initialization 



Currently, the driver does not set the port's PVID when initializing a
new port. This is because the driver is using VID 1 as PVID which is the
firmware default.

Subsequent patches are going to change the PVID the driver is setting
when initializing a new port.

Prepare for that by explicitly setting the port's PVID.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2d2a205

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -3181,6 +3181,13 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_port_nve_init;

		goto err_port_nve_init;

	}

	}





	err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, MLXSW_SP_DEFAULT_VID);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to set PVID\n",

			mlxsw_sp_port->local_port);

		goto err_port_pvid_set;

	}



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_create(mlxsw_sp_port,

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_create(mlxsw_sp_port,

						       MLXSW_SP_DEFAULT_VID);

						       MLXSW_SP_DEFAULT_VID);

	if (IS_ERR(mlxsw_sp_port_vlan)) {

	if (IS_ERR(mlxsw_sp_port_vlan)) {
@@ -3210,6 +3217,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

err_port_vlan_create:

err_port_vlan_create:

err_port_pvid_set:

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

err_port_nve_init:

err_port_nve_init:

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);