Commit 2ec16ddd authored by Rongwei Liu's avatar Rongwei Liu Committed by Saeed Mahameed
Browse files

net/mlx5: Introduce new device index wrapper 



Downstream patches.

Signed-off-by: default avatarRongwei Liu <rongweil@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 7b1b6d35

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ int mlx5e_devlink_port_register(struct mlx5e_priv *priv) 


	if (mlx5_core_is_pf(priv->mdev)) {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

		attrs.phys.port_number = PCI_FUNC(priv->mdev->pdev->devfn);

		attrs.phys.port_number = mlx5_get_dev_index(priv->mdev);

		if (MLX5_ESWITCH_MANAGER(priv->mdev)) {

			mlx5e_devlink_get_port_parent_id(priv->mdev, &ppid);

			memcpy(attrs.switch_id.id, ppid.id, ppid.id_len);

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

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static struct devlink_port *mlx5_esw_dl_port_alloc(struct mlx5_eswitch *esw, u16 
		return NULL;



	mlx5_esw_get_port_parent_id(dev, &ppid);

	pfnum = PCI_FUNC(dev->pdev->devfn);

	pfnum = mlx5_get_dev_index(dev);

	external = mlx5_core_is_ecpf_esw_manager(dev);

	if (external)

		controller_num = dev->priv.eswitch->offloads.host_number + 1;
@@ -149,7 +149,7 @@ int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_p 
	if (IS_ERR(vport))

		return PTR_ERR(vport);



	pfnum = PCI_FUNC(dev->pdev->devfn);

	pfnum = mlx5_get_dev_index(dev);

	mlx5_esw_get_port_parent_id(dev, &ppid);

	memcpy(dl_port->attrs.switch_id.id, &ppid.id[0], ppid.id_len);

	dl_port->attrs.switch_id.id_len = ppid.id_len;

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

+1 −1
Original line number Diff line number Diff line
@@ -2798,7 +2798,7 @@ u32 mlx5_esw_match_metadata_alloc(struct mlx5_eswitch *esw) 
	int id;



	/* Only 4 bits of pf_num */

	pf_num = PCI_FUNC(esw->dev->pdev->devfn);

	pf_num = mlx5_get_dev_index(esw->dev);

	if (pf_num > max_pf_num)

		return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static void mlx5_ldev_add_netdev(struct mlx5_lag *ldev, 
				 struct mlx5_core_dev *dev,

				 struct net_device *netdev)

{

	unsigned int fn = PCI_FUNC(dev->pdev->devfn);

	unsigned int fn = mlx5_get_dev_index(dev);



	if (fn >= MLX5_MAX_PORTS)

		return;
@@ -718,7 +718,7 @@ static void mlx5_ldev_remove_netdev(struct mlx5_lag *ldev, 
static void mlx5_ldev_add_mdev(struct mlx5_lag *ldev,

			       struct mlx5_core_dev *dev)

{

	unsigned int fn = PCI_FUNC(dev->pdev->devfn);

	unsigned int fn = mlx5_get_dev_index(dev);



	if (fn >= MLX5_MAX_PORTS)

		return;

drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ mlx5_sf_new_check_attr(struct mlx5_core_dev *dev, const struct devlink_port_new_ 
		NL_SET_ERR_MSG_MOD(extack, "External controller is unsupported");

		return -EOPNOTSUPP;

	}

	if (new_attr->pfnum != PCI_FUNC(dev->pdev->devfn)) {

	if (new_attr->pfnum != mlx5_get_dev_index(dev)) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid pfnum supplied");

		return -EOPNOTSUPP;

	}