Commit f52cc627 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Revert "net/mlx5: Enable management PF initialization" 



This reverts commit fe998a3c.

Paul reports that it causes a regression with IB on CX4
and FW 12.18.1000. In addition I think that the concept
of "management PF" is not fully accepted and requires
a discussion.

Fixes: fe998a3c ("net/mlx5: Enable management PF initialization")
Reported-by: default avatarPaul Moore <paul@paul-moore.com>
Link: https://lore.kernel.org/all/CAHC9VhQ7A4+msL38WpbOMYjAqLp0EtOjeLh4Dc6SQtD6OUvCQg@mail.gmail.com/
Link: https://lore.kernel.org/r/20230413222547.56901-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9d947690

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

+0 −6
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ bool mlx5_eth_supported(struct mlx5_core_dev *dev) 
	if (!IS_ENABLED(CONFIG_MLX5_CORE_EN))

		return false;



	if (mlx5_core_is_management_pf(dev))

		return false;



	if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return false;
@@ -201,9 +198,6 @@ bool mlx5_rdma_supported(struct mlx5_core_dev *dev) 
	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))

		return false;



	if (mlx5_core_is_management_pf(dev))

		return false;



	if (dev->priv.flags & MLX5_PRIV_FLAGS_DISABLE_IB_ADEV)

		return false;

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

+0 −8
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ int mlx5_ec_init(struct mlx5_core_dev *dev) 
	if (!mlx5_core_is_ecpf(dev))

		return 0;



	/* Management PF don't have a peer PF */

	if (mlx5_core_is_management_pf(dev))

		return 0;



	return mlx5_host_pf_init(dev);

}
@@ -89,10 +85,6 @@ void mlx5_ec_cleanup(struct mlx5_core_dev *dev) 
	if (!mlx5_core_is_ecpf(dev))

		return;



	/* Management PF don't have a peer PF */

	if (mlx5_core_is_management_pf(dev))

		return;



	mlx5_host_pf_cleanup(dev);



	err = mlx5_wait_for_pages(dev, &dev->priv.page_counters[MLX5_HOST_PF]);

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

+1 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,7 @@ int mlx5_esw_sf_max_hpf_functions(struct mlx5_core_dev *dev, u16 *max_sfs, u16 * 
	void *hca_caps;

	int err;



	if (!mlx5_core_is_ecpf(dev) || mlx5_core_is_management_pf(dev)) {

	if (!mlx5_core_is_ecpf(dev)) {

		*max_sfs = 0;

		return 0;

	}

include/linux/mlx5/driver.h

+0 −5
Original line number Diff line number Diff line
@@ -1211,11 +1211,6 @@ static inline bool mlx5_core_is_vf(const struct mlx5_core_dev *dev) 
	return dev->coredev_type == MLX5_COREDEV_VF;

}



static inline bool mlx5_core_is_management_pf(const struct mlx5_core_dev *dev)

{

	return MLX5_CAP_GEN(dev, num_ports) == 1 && !MLX5_CAP_GEN(dev, native_port_num);

}



static inline bool mlx5_core_is_ecpf(const struct mlx5_core_dev *dev)

{

	return dev->caps.embedded_cpu;