Commit b940ec4b authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed
Browse files

net/mlx5: Remove no longer used mlx5_esw_offloads_sf_vport_enable/disable() 



Since the previous patch removed the only users of these functions,
remove them.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent e855afd7

drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c

+0 −53
Original line number Diff line number Diff line
@@ -214,56 +214,3 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1 
	vport = mlx5_eswitch_get_vport(esw, vport_num);

	return IS_ERR(vport) ? ERR_CAST(vport) : vport->dl_port;

}
 


int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

				      u16 vport_num, u32 controller, u32 sfnum)

{

	struct mlx5_core_dev *dev = esw->dev;

	unsigned int dl_port_index;

	struct mlx5_vport *vport;

	struct devlink *devlink;

	int err;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return PTR_ERR(vport);



	err = mlx5_esw_offloads_sf_devlink_port_init(esw, vport_num, dl_port, controller, sfnum);

	if (err)

		return err;



	devlink = priv_to_devlink(dev);

	dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, vport_num);

	err = devl_port_register_with_ops(devlink, dl_port, dl_port_index,

					  &mlx5_esw_dl_sf_port_ops);

	if (err)

		goto reg_err;



	err = devl_rate_leaf_create(dl_port, vport, NULL);

	if (err)

		goto rate_err;



	return 0;



rate_err:

	devl_port_unregister(dl_port);



reg_err:

	mlx5_esw_offloads_sf_devlink_port_cleanup(esw, vport_num);

	return err;

}



void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_num)

{

	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return;



	mlx5_esw_qos_vport_update_group(esw, vport, NULL, NULL);

	devl_rate_leaf_destroy(vport->dl_port);



	devl_port_unregister(vport->dl_port);

	mlx5_esw_offloads_sf_devlink_port_cleanup(esw, vport_num);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -761,13 +761,6 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_ 
void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, u16 vport_num);

struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u16 vport_num);



int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

				      u16 vport_num, u32 controller, u32 sfnum);

void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_num);



int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

				      u16 vport_num, u32 controller, u32 sfnum);

void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 vport_num);

int mlx5_esw_sf_max_hpf_functions(struct mlx5_core_dev *dev, u16 *max_sfs, u16 *sf_base_id);



int mlx5_esw_vport_vhca_id_set(struct mlx5_eswitch *esw, u16 vport_num);

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

+0 −32
Original line number Diff line number Diff line
@@ -4130,38 +4130,6 @@ u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, 
}

EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_for_match);



int mlx5_esw_offloads_sf_vport_enable(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

				      u16 vport_num, u32 controller, u32 sfnum)

{

	int err;



	err = mlx5_esw_vport_enable(esw, vport_num, MLX5_VPORT_UC_ADDR_CHANGE);

	if (err)

		return err;



	err = mlx5_esw_devlink_sf_port_register(esw, dl_port, vport_num, controller, sfnum);

	if (err)

		goto devlink_err;



	err = mlx5_esw_offloads_rep_load(esw, vport_num);

	if (err)

		goto rep_err;

	return 0;



rep_err:

	mlx5_esw_devlink_sf_port_unregister(esw, vport_num);

devlink_err:

	mlx5_esw_vport_disable(esw, vport_num);

	return err;

}



void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 vport_num)

{

	mlx5_esw_offloads_rep_unload(esw, vport_num);

	mlx5_esw_devlink_sf_port_unregister(esw, vport_num);

	mlx5_esw_vport_disable(esw, vport_num);

}



static int mlx5_esw_query_vport_vhca_id(struct mlx5_eswitch *esw, u16 vport_num, u16 *vhca_id)

{

	int query_out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);