net/mlx5: Fix query_nic_sys_image_guid() error during init (0a5b5891) · Commits · 戴 / test

vport system image guid should be queried using vport nic API for Ethernet ports, and vport hca API for Infiniband ports. Fixes: ("net/mlx5: Introduce inter-device communication mechanism") Signed-off-by:

Aviv Heller <avivh@mellanox.com> Signed-off-by:

Saeed Mahameed <saeedm@mellanox.com>

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -1204,9 +1204,19 @@ EXPORT_SYMBOL_GPL(mlx5_nic_vport_unaffiliate_multiport);

		u64 mlx5_query_nic_system_image_guid(struct mlx5_core_dev *mdev)
		{
		if (!mdev->sys_image_guid)
		mlx5_query_nic_vport_system_image_guid(mdev, &mdev->sys_image_guid);
		int port_type_cap = MLX5_CAP_GEN(mdev, port_type);
		u64 tmp = 0;

		if (mdev->sys_image_guid)
		return mdev->sys_image_guid;

		if (port_type_cap == MLX5_CAP_PORT_TYPE_ETH)
		mlx5_query_nic_vport_system_image_guid(mdev, &tmp);
		else
		mlx5_query_hca_vport_system_image_guid(mdev, &tmp);

		mdev->sys_image_guid = tmp;

		return tmp;
		}
		EXPORT_SYMBOL_GPL(mlx5_query_nic_system_image_guid);

Admin message