Commit cc617ced authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: E-switch, make query inline mode a static function 



mlx5_eswitch_inline_mode_get() is used only in eswitch_offloads.c.
Hence, make it static and adjacent to its caller function.

Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarBodong Wang <bodong@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 891b8f33

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

+0 −1
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ int mlx5_devlink_eswitch_mode_get(struct devlink *devlink, u16 *mode); 
int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode,

					 struct netlink_ext_ack *extack);

int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode);

int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, u8 *mode);

int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,

					enum devlink_eswitch_encap_mode encap,

					struct netlink_ext_ack *extack);

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

+37 −37
Original line number Diff line number Diff line
@@ -1344,6 +1344,43 @@ out: 
	return flow_rule;

}



static int mlx5_eswitch_inline_mode_get(const struct mlx5_eswitch *esw, u8 *mode)

{

	u8 prev_mlx5_mode, mlx5_mode = MLX5_INLINE_MODE_L2;

	struct mlx5_core_dev *dev = esw->dev;

	int vport;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == MLX5_ESWITCH_NONE)

		return -EOPNOTSUPP;



	switch (MLX5_CAP_ETH(dev, wqe_inline_mode)) {

	case MLX5_CAP_INLINE_MODE_NOT_REQUIRED:

		mlx5_mode = MLX5_INLINE_MODE_NONE;

		goto out;

	case MLX5_CAP_INLINE_MODE_L2:

		mlx5_mode = MLX5_INLINE_MODE_L2;

		goto out;

	case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT:

		goto query_vports;

	}



query_vports:

	mlx5_query_nic_vport_min_inline(dev, esw->first_host_vport, &prev_mlx5_mode);

	mlx5_esw_for_each_host_func_vport(esw, vport, esw->esw_funcs.num_vfs) {

		mlx5_query_nic_vport_min_inline(dev, vport, &mlx5_mode);

		if (prev_mlx5_mode != mlx5_mode)

			return -EINVAL;

		prev_mlx5_mode = mlx5_mode;

	}



out:

	*mode = mlx5_mode;

	return 0;

}



static int esw_offloads_start(struct mlx5_eswitch *esw,

			      struct netlink_ext_ack *extack)

{
@@ -2491,43 +2528,6 @@ int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode) 
	return esw_inline_mode_to_devlink(esw->offloads.inline_mode, mode);

}



int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, u8 *mode)

{

	u8 prev_mlx5_mode, mlx5_mode = MLX5_INLINE_MODE_L2;

	struct mlx5_core_dev *dev = esw->dev;

	int vport;



	if (!MLX5_CAP_GEN(dev, vport_group_manager))

		return -EOPNOTSUPP;



	if (esw->mode == MLX5_ESWITCH_NONE)

		return -EOPNOTSUPP;



	switch (MLX5_CAP_ETH(dev, wqe_inline_mode)) {

	case MLX5_CAP_INLINE_MODE_NOT_REQUIRED:

		mlx5_mode = MLX5_INLINE_MODE_NONE;

		goto out;

	case MLX5_CAP_INLINE_MODE_L2:

		mlx5_mode = MLX5_INLINE_MODE_L2;

		goto out;

	case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT:

		goto query_vports;

	}



query_vports:

	mlx5_query_nic_vport_min_inline(dev, esw->first_host_vport, &prev_mlx5_mode);

	mlx5_esw_for_each_host_func_vport(esw, vport, esw->esw_funcs.num_vfs) {

		mlx5_query_nic_vport_min_inline(dev, vport, &mlx5_mode);

		if (prev_mlx5_mode != mlx5_mode)

			return -EINVAL;

		prev_mlx5_mode = mlx5_mode;

	}



out:

	*mode = mlx5_mode;

	return 0;

}



int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,

					enum devlink_eswitch_encap_mode encap,

					struct netlink_ext_ack *extack)

CRA Git | Maintained and supported by SUSTech CRA and CCSE