Commit 9a64144d authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Fix default encap mode 



Encap mode is related to switchdev mode only. Move the init of
the encap mode to eswitch_offloads. Before this change, we reported
that eswitch supports encap, even tough the device was in non
SRIOV mode.

Fixes: 7768d197 ('net/mlx5: E-Switch, Add control for encapsulation')
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent e858faf5

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+0 −5
Original line number Diff line number Diff line
@@ -1882,11 +1882,6 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	esw->enabled_vports = 0;

	esw->mode = SRIOV_NONE;

	esw->offloads.inline_mode = MLX5_INLINE_MODE_NONE;

	if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, reformat) &&

	    MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;

	else

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;



	dev->priv.eswitch = esw;

	return 0;

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+7 −0
Original line number Diff line number Diff line
@@ -1840,6 +1840,12 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports, 
{

	int err;



	if (MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, reformat) &&

	    MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, decap))

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;

	else

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;



	err = esw_offloads_steering_init(esw, vf_nvports, total_nvports);

	if (err)

		return err;
@@ -1901,6 +1907,7 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw) 
	esw_offloads_devcom_cleanup(esw);

	esw_offloads_unload_all_reps(esw, num_vfs);

	esw_offloads_steering_cleanup(esw);

	esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;

}



static int esw_mode_from_devlink(u16 mode, u16 *mlx5_mode)

CRA Git | Maintained and supported by SUSTech CRA and CCSE