Revert "net/mlx5: Enable management PF initialization"
Subsystems (4)
Jakub Kicinski
maintainerPATCH 1/1 Revert "net/mlx5: Enable management PF initialization"
This reverts commit fe998a3c77b9f989a30a2a01fb00d3729a6d53a4.
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.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 6 ------ drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 8 -------- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- include/linux/mlx5/driver.h | 5 ----- 4 files changed, 1 insertion(+), 20 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +0 -6
@@ -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
@@ -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
@@ -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
@@ -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;
Signature · 1 line
2.39.2
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 13 Apr 2023 15:25:47 -0700 you wrote:
This reverts commit
fe998a3c77b9f989a30a2a01fb00d3729a6d53a4.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.
[...]
Here is the summary with links:
- [net] Revert "net/mlx5: Enable management PF initialization"
https://git.kernel.org/netdev/net/c/f52cc627b832
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html