Commit f52cc627 authored by Jakub Kicinski's avatar Jakub Kicinski

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.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9d947690
...@@ -59,9 +59,6 @@ bool mlx5_eth_supported(struct mlx5_core_dev *dev) ...@@ -59,9 +59,6 @@ bool mlx5_eth_supported(struct mlx5_core_dev *dev)
if (!IS_ENABLED(CONFIG_MLX5_CORE_EN)) if (!IS_ENABLED(CONFIG_MLX5_CORE_EN))
return false; return false;
if (mlx5_core_is_management_pf(dev))
return false;
if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH) if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
return false; return false;
...@@ -201,9 +198,6 @@ bool mlx5_rdma_supported(struct mlx5_core_dev *dev) ...@@ -201,9 +198,6 @@ bool mlx5_rdma_supported(struct mlx5_core_dev *dev)
if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND)) if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))
return false; return false;
if (mlx5_core_is_management_pf(dev))
return false;
if (dev->priv.flags & MLX5_PRIV_FLAGS_DISABLE_IB_ADEV) if (dev->priv.flags & MLX5_PRIV_FLAGS_DISABLE_IB_ADEV)
return false; return false;
......
...@@ -75,10 +75,6 @@ int mlx5_ec_init(struct mlx5_core_dev *dev) ...@@ -75,10 +75,6 @@ int mlx5_ec_init(struct mlx5_core_dev *dev)
if (!mlx5_core_is_ecpf(dev)) if (!mlx5_core_is_ecpf(dev))
return 0; 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); return mlx5_host_pf_init(dev);
} }
...@@ -89,10 +85,6 @@ void mlx5_ec_cleanup(struct mlx5_core_dev *dev) ...@@ -89,10 +85,6 @@ void mlx5_ec_cleanup(struct mlx5_core_dev *dev)
if (!mlx5_core_is_ecpf(dev)) if (!mlx5_core_is_ecpf(dev))
return; return;
/* Management PF don't have a peer PF */
if (mlx5_core_is_management_pf(dev))
return;
mlx5_host_pf_cleanup(dev); mlx5_host_pf_cleanup(dev);
err = mlx5_wait_for_pages(dev, &dev->priv.page_counters[MLX5_HOST_PF]); err = mlx5_wait_for_pages(dev, &dev->priv.page_counters[MLX5_HOST_PF]);
......
...@@ -1488,7 +1488,7 @@ int mlx5_esw_sf_max_hpf_functions(struct mlx5_core_dev *dev, u16 *max_sfs, u16 * ...@@ -1488,7 +1488,7 @@ int mlx5_esw_sf_max_hpf_functions(struct mlx5_core_dev *dev, u16 *max_sfs, u16 *
void *hca_caps; void *hca_caps;
int err; int err;
if (!mlx5_core_is_ecpf(dev) || mlx5_core_is_management_pf(dev)) { if (!mlx5_core_is_ecpf(dev)) {
*max_sfs = 0; *max_sfs = 0;
return 0; return 0;
} }
......
...@@ -1211,11 +1211,6 @@ static inline bool mlx5_core_is_vf(const struct mlx5_core_dev *dev) ...@@ -1211,11 +1211,6 @@ static inline bool mlx5_core_is_vf(const struct mlx5_core_dev *dev)
return dev->coredev_type == MLX5_COREDEV_VF; 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) static inline bool mlx5_core_is_ecpf(const struct mlx5_core_dev *dev)
{ {
return dev->caps.embedded_cpu; return dev->caps.embedded_cpu;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment