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

net/mlx5e: Use vhca_id in generating representor port_index 



It is desired to use unique port indices when multiple pci devices'
devlink instance have the same switch-id.

Make use of vhca-id to generate such unique devlink port indices.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 724ee179

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

+16 −4
Original line number Diff line number Diff line
@@ -1746,34 +1746,46 @@ is_devlink_port_supported(const struct mlx5_core_dev *dev, 
	       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,

				 struct mlx5e_rep_priv *rpriv)

{

	struct devlink *devlink = priv_to_devlink(dev);

	struct mlx5_eswitch_rep *rep = rpriv->rep;

	struct netdev_phys_item_id ppid = {};

	unsigned int dl_port_index = 0;



	if (!is_devlink_port_supported(dev, rpriv))

		return 0;



	mlx5e_rep_get_port_parent_id(rpriv->netdev, &ppid);



	if (rep->vport == MLX5_VPORT_UPLINK)

	if (rep->vport == MLX5_VPORT_UPLINK) {

		devlink_port_attrs_set(&rpriv->dl_port,

				       DEVLINK_PORT_FLAVOUR_PHYSICAL,

				       PCI_FUNC(dev->pdev->devfn), false, 0,

				       &ppid.id[0], ppid.id_len);

	else if (rep->vport == MLX5_VPORT_PF)

		dl_port_index = vport_to_devlink_port_index(dev, rep->vport);

	} else if (rep->vport == MLX5_VPORT_PF) {

		devlink_port_attrs_pci_pf_set(&rpriv->dl_port,

					      &ppid.id[0], ppid.id_len,

					      dev->pdev->devfn);

	else if (mlx5_eswitch_is_vf_vport(dev->priv.eswitch, rpriv->rep->vport))

		dl_port_index = rep->vport;

	} else if (mlx5_eswitch_is_vf_vport(dev->priv.eswitch,

					    rpriv->rep->vport)) {

		devlink_port_attrs_pci_vf_set(&rpriv->dl_port,

					      &ppid.id[0], ppid.id_len,

					      dev->pdev->devfn,

					      rep->vport - 1);

		dl_port_index = vport_to_devlink_port_index(dev, rep->vport);

	}



	return devlink_port_register(devlink, &rpriv->dl_port, rep->vport);

	return devlink_port_register(devlink, &rpriv->dl_port, dl_port_index);

}



static void unregister_devlink_port(struct mlx5_core_dev *dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE