Linux 6.9-rc1

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlx5 / core / pagealloc.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index 95dc67f..dcf58ef 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -79,7 +79,13 @@ static u16 func_id_to_type(struct mlx5_core_dev *dev, u16 func_id, bool ec_funct
        if (!func_id)
                return mlx5_core_is_ecpf(dev) && !ec_function ? MLX5_HOST_PF : MLX5_PF;
 
-       return func_id <= mlx5_core_max_vfs(dev) ?  MLX5_VF : MLX5_SF;
+       if (func_id <= max(mlx5_core_max_vfs(dev), mlx5_core_max_ec_vfs(dev))) {
+               if (ec_function)
+                       return MLX5_EC_VF;
+               else
+                       return MLX5_VF;
+       }
+       return MLX5_SF;
 }
 
 static u32 mlx5_get_ec_function(u32 function)
@@ -730,6 +736,9 @@ int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev)
        WARN(dev->priv.page_counters[MLX5_HOST_PF],
             "External host PF FW pages counter is %d after reclaiming all pages\n",
             dev->priv.page_counters[MLX5_HOST_PF]);
+       WARN(dev->priv.page_counters[MLX5_EC_VF],
+            "EC VFs FW pages counter is %d after reclaiming all pages\n",
+            dev->priv.page_counters[MLX5_EC_VF]);
 
        return 0;
 }