Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34d54566 authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Greg Kroah-Hartman
Browse files

net/mlx5: Consider PCI domain in search for next dev 



[ Upstream commit df7ddb2396cd162e64aaff9401be05e31e438961 ]

The PCI BDF is not unique. PCI domain must also be considered when
searching for the next physical device during lag setup. Example below:

mlx5_core 0000:01:00.0: MLX5E: StrdRq(1) RqSz(8) StrdSz(128) RxCqeCmprss(0)
mlx5_core 0000:01:00.1: MLX5E: StrdRq(1) RqSz(8) StrdSz(128) RxCqeCmprss(0)
mlx5_core 0001:01:00.0: MLX5E: StrdRq(1) RqSz(8) StrdSz(128) RxCqeCmprss(0)
mlx5_core 0001:01:00.1: MLX5E: StrdRq(1) RqSz(8) StrdSz(128) RxCqeCmprss(0)

Signed-off-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Reviewed-by: default avatarAviv Heller <avivh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f36f3ebd

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

+4 −3
Original line number Diff line number Diff line
@@ -388,16 +388,17 @@ void mlx5_remove_dev_by_protocol(struct mlx5_core_dev *dev, int protocol) 
		}

}



static u16 mlx5_gen_pci_id(struct mlx5_core_dev *dev)

static u32 mlx5_gen_pci_id(struct mlx5_core_dev *dev)

{

	return (u16)((dev->pdev->bus->number << 8) |

	return (u32)((pci_domain_nr(dev->pdev->bus) << 16) |

		     (dev->pdev->bus->number << 8) |

		     PCI_SLOT(dev->pdev->devfn));

}



/* Must be called with intf_mutex held */

struct mlx5_core_dev *mlx5_get_next_phys_dev(struct mlx5_core_dev *dev)

{

	u16 pci_id = mlx5_gen_pci_id(dev);

	u32 pci_id = mlx5_gen_pci_id(dev);

	struct mlx5_core_dev *res = NULL;

	struct mlx5_core_dev *tmp_dev;

	struct mlx5_priv *priv;