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

Commit ef78618b authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5: E-Switch, Return the correct devlink e-switch mode 



Since mlx5 has also the NONE e-switch mode, we must translate from mlx5
mode to devlink mode on the devlink eswitch mode get call, do that.

While here, remove the mlx5_ prefix from the static function helpers
that deal with the mode to comply with the rest of the code.

Fixes: c930a3ad ('net/mlx5e: Add devlink based SRIOV mode change')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbe413e3

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

+19 −5
Original line number Original line Diff line number Diff line
@@ -535,7 +535,7 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw, int nvports) 
	esw_destroy_offloads_fdb_table(esw);

	esw_destroy_offloads_fdb_table(esw);

}

}





static int mlx5_esw_mode_from_devlink(u16 mode, u16 *mlx5_mode)

static int esw_mode_from_devlink(u16 mode, u16 *mlx5_mode)

{

{

	switch (mode) {

	switch (mode) {

	case DEVLINK_ESWITCH_MODE_LEGACY:

	case DEVLINK_ESWITCH_MODE_LEGACY:
@@ -551,6 +551,22 @@ static int mlx5_esw_mode_from_devlink(u16 mode, u16 *mlx5_mode) 
	return 0;

	return 0;

}

}





static int esw_mode_to_devlink(u16 mlx5_mode, u16 *mode)

{

	switch (mlx5_mode) {

	case SRIOV_LEGACY:

		*mode = DEVLINK_ESWITCH_MODE_LEGACY;

		break;

	case SRIOV_OFFLOADS:

		*mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)

int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode)

{

{

	struct mlx5_core_dev *dev;

	struct mlx5_core_dev *dev;
@@ -566,7 +582,7 @@ int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode) 
	if (cur_mlx5_mode == SRIOV_NONE)

	if (cur_mlx5_mode == SRIOV_NONE)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	if (mlx5_esw_mode_from_devlink(mode, &mlx5_mode))

	if (esw_mode_from_devlink(mode, &mlx5_mode))

		return -EINVAL;

		return -EINVAL;





	if (cur_mlx5_mode == mlx5_mode)

	if (cur_mlx5_mode == mlx5_mode)
@@ -592,9 +608,7 @@ int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode) 
	if (dev->priv.eswitch->mode == SRIOV_NONE)

	if (dev->priv.eswitch->mode == SRIOV_NONE)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	*mode = dev->priv.eswitch->mode;

	return esw_mode_to_devlink(dev->priv.eswitch->mode, mode);



	return 0;

}

}





void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,

void mlx5_eswitch_register_vport_rep(struct mlx5_eswitch *esw,