Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / mellanox / mlx5 / core / lib / gid.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c
index 215fa8b..96ffc0a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c
@@ -55,10 +55,6 @@ void mlx5_cleanup_reserved_gids(struct mlx5_core_dev *dev)
 
 int mlx5_core_reserve_gids(struct mlx5_core_dev *dev, unsigned int count)
 {
-       if (test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {
-               mlx5_core_err(dev, "Cannot reserve GIDs when interfaces are up\n");
-               return -EPERM;
-       }
        if (dev->roce.reserved_gids.start < count) {
                mlx5_core_warn(dev, "GID table exhausted attempting to reserve %d more GIDs\n",
                               count);
@@ -79,7 +75,6 @@ int mlx5_core_reserve_gids(struct mlx5_core_dev *dev, unsigned int count)
 
 void mlx5_core_unreserve_gids(struct mlx5_core_dev *dev, unsigned int count)
 {
-       WARN(test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state), "Unreserving GIDs when interfaces are up");
        WARN(count > dev->roce.reserved_gids.count, "Unreserving %u GIDs when only %u reserved",
             count, dev->roce.reserved_gids.count);
 
@@ -93,12 +88,12 @@ void mlx5_core_unreserve_gids(struct mlx5_core_dev *dev, unsigned int count)
 int mlx5_core_reserved_gid_alloc(struct mlx5_core_dev *dev, int *gid_index)
 {
        int end = dev->roce.reserved_gids.start +
-                 dev->roce.reserved_gids.count;
+                 dev->roce.reserved_gids.count - 1;
        int index = 0;
 
-       index = ida_simple_get(&dev->roce.reserved_gids.ida,
-                              dev->roce.reserved_gids.start, end,
-                              GFP_KERNEL);
+       index = ida_alloc_range(&dev->roce.reserved_gids.ida,
+                               dev->roce.reserved_gids.start, end,
+                               GFP_KERNEL);
        if (index < 0)
                return index;
 
@@ -110,7 +105,7 @@ int mlx5_core_reserved_gid_alloc(struct mlx5_core_dev *dev, int *gid_index)
 void mlx5_core_reserved_gid_free(struct mlx5_core_dev *dev, int gid_index)
 {
        mlx5_core_dbg(dev, "Freeing reserved GID %u\n", gid_index);
-       ida_simple_remove(&dev->roce.reserved_gids.ida, gid_index);
+       ida_free(&dev->roce.reserved_gids.ida, gid_index);
 }
 
 unsigned int mlx5_core_reserved_gids_count(struct mlx5_core_dev *dev)