Commit f0a64199 authored by Yangyang Li's avatar Yangyang Li Committed by Jason Gunthorpe
Browse files

RDMA/hns: Delete unused hns bitmap interface 

The resources that use the hns bitmap interface: qp, cq, mr, pd, xrcd,
uar, srq, have been changed to IDA interfaces, and the unused hns' own
bitmap interfaces need to be deleted.

Link: https://lore.kernel.org/r/1629336980-17499-4-git-send-email-liangwenpeng@huawei.com


Signed-off-by: default avatarYangyang Li <liyangyang20@huawei.com>
Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c4f11b36

drivers/infiniband/hw/hns/hns_roce_alloc.c

+0 −70
Original line number Diff line number Diff line
@@ -36,76 +36,6 @@ 
#include "hns_roce_device.h"

#include <rdma/ib_umem.h>



int hns_roce_bitmap_alloc(struct hns_roce_bitmap *bitmap, unsigned long *obj)

{

	int ret = 0;



	spin_lock(&bitmap->lock);

	*obj = find_next_zero_bit(bitmap->table, bitmap->max, bitmap->last);

	if (*obj >= bitmap->max) {

		bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)

			       & bitmap->mask;

		*obj = find_first_zero_bit(bitmap->table, bitmap->max);

	}



	if (*obj < bitmap->max) {

		set_bit(*obj, bitmap->table);

		bitmap->last = (*obj + 1);

		if (bitmap->last == bitmap->max)

			bitmap->last = 0;

		*obj |= bitmap->top;

	} else {

		ret = -EINVAL;

	}



	spin_unlock(&bitmap->lock);



	return ret;

}



void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj)

{

	obj &= bitmap->max + bitmap->reserved_top - 1;



	spin_lock(&bitmap->lock);

	clear_bit(obj, bitmap->table);



	bitmap->last = min(bitmap->last, obj);

	bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)

		       & bitmap->mask;

	spin_unlock(&bitmap->lock);

}



int hns_roce_bitmap_init(struct hns_roce_bitmap *bitmap, u32 num, u32 mask,

			 u32 reserved_bot, u32 reserved_top)

{

	u32 i;



	if (num != roundup_pow_of_two(num))

		return -EINVAL;



	bitmap->last = 0;

	bitmap->top = 0;

	bitmap->max = num - reserved_top;

	bitmap->mask = mask;

	bitmap->reserved_top = reserved_top;

	spin_lock_init(&bitmap->lock);

	bitmap->table = kcalloc(BITS_TO_LONGS(bitmap->max), sizeof(long),

				GFP_KERNEL);

	if (!bitmap->table)

		return -ENOMEM;



	for (i = 0; i < reserved_bot; ++i)

		set_bit(i, bitmap->table);



	return 0;

}



void hns_roce_bitmap_cleanup(struct hns_roce_bitmap *bitmap)

{

	kfree(bitmap->table);

}



void hns_roce_buf_free(struct hns_roce_dev *hr_dev, struct hns_roce_buf *buf)

{

	struct hns_roce_buf_list *trunks;

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −5
Original line number Diff line number Diff line
@@ -1152,11 +1152,6 @@ void hns_roce_cleanup_eq_table(struct hns_roce_dev *hr_dev); 
void hns_roce_cleanup_cq_table(struct hns_roce_dev *hr_dev);

void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev);



int hns_roce_bitmap_alloc(struct hns_roce_bitmap *bitmap, unsigned long *obj);

void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj);

int hns_roce_bitmap_init(struct hns_roce_bitmap *bitmap, u32 num, u32 mask,

			 u32 reserved_bot, u32 resetrved_top);

void hns_roce_bitmap_cleanup(struct hns_roce_bitmap *bitmap);

void hns_roce_cleanup_bitmap(struct hns_roce_dev *hr_dev);



int hns_roce_create_ah(struct ib_ah *ah, struct rdma_ah_init_attr *init_attr,