Commit 443bf36e authored by Parav Pandit's avatar Parav Pandit Committed by David S. Miller

net/mlx5: Move helper to eswitch layer

To use port number to port index conversion at eswitch level, move it to
eswitch header.
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd939753
...@@ -1181,12 +1181,6 @@ is_devlink_port_supported(const struct mlx5_core_dev *dev, ...@@ -1181,12 +1181,6 @@ is_devlink_port_supported(const struct mlx5_core_dev *dev,
mlx5_eswitch_is_vf_vport(dev->priv.eswitch, rpriv->rep->vport); mlx5_eswitch_is_vf_vport(dev->priv.eswitch, rpriv->rep->vport);
} }
static unsigned int
vport_to_devlink_port_index(const struct mlx5_core_dev *dev, u16 vport_num)
{
return (MLX5_CAP_GEN(dev, vhca_id) << 16) | vport_num;
}
static int register_devlink_port(struct mlx5_core_dev *dev, static int register_devlink_port(struct mlx5_core_dev *dev,
struct mlx5e_rep_priv *rpriv) struct mlx5e_rep_priv *rpriv)
{ {
...@@ -1200,7 +1194,7 @@ static int register_devlink_port(struct mlx5_core_dev *dev, ...@@ -1200,7 +1194,7 @@ static int register_devlink_port(struct mlx5_core_dev *dev,
return 0; return 0;
mlx5e_rep_get_port_parent_id(rpriv->netdev, &ppid); mlx5e_rep_get_port_parent_id(rpriv->netdev, &ppid);
dl_port_index = vport_to_devlink_port_index(dev, rep->vport); dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, rep->vport);
pfnum = PCI_FUNC(dev->pdev->devfn); pfnum = PCI_FUNC(dev->pdev->devfn);
if (rep->vport == MLX5_VPORT_UPLINK) if (rep->vport == MLX5_VPORT_UPLINK)
......
...@@ -565,6 +565,13 @@ static inline u16 mlx5_eswitch_index_to_vport_num(struct mlx5_eswitch *esw, ...@@ -565,6 +565,13 @@ static inline u16 mlx5_eswitch_index_to_vport_num(struct mlx5_eswitch *esw,
return index; return index;
} }
static inline unsigned int
mlx5_esw_vport_to_devlink_port_index(const struct mlx5_core_dev *dev,
u16 vport_num)
{
return (MLX5_CAP_GEN(dev, vhca_id) << 16) | vport_num;
}
/* TODO: This mlx5e_tc function shouldn't be called by eswitch */ /* TODO: This mlx5e_tc function shouldn't be called by eswitch */
void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw); void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment