Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c61b245 authored by YueHaibing's avatar YueHaibing Committed by Jason Gunthorpe
Browse files

IB/hns: Use zeroing memory allocator instead of allocator/memset 



Use dma_zalloc_coherent for allocating zeroed memory and
remove unnecessary memset function.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent cb2595c1

drivers/infiniband/hw/hns/hns_roce_alloc.c

+3 −5
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct, 
		buf->npages = 1 << order;

		buf->page_shift = page_shift;

		/* MTT PA must be recorded in 4k alignment, t is 4k aligned */

		buf->direct.buf = dma_alloc_coherent(dev, size, &t, GFP_KERNEL);

		buf->direct.buf = dma_zalloc_coherent(dev,

						      size, &t, GFP_KERNEL);

		if (!buf->direct.buf)

			return -ENOMEM;
@@ -207,8 +208,6 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct, 
			--buf->page_shift;

			buf->npages *= 2;

		}



		memset(buf->direct.buf, 0, size);

	} else {

		buf->nbufs = (size + page_size - 1) / page_size;

		buf->npages = buf->nbufs;
@@ -220,7 +219,7 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct, 
			return -ENOMEM;



		for (i = 0; i < buf->nbufs; ++i) {

			buf->page_list[i].buf = dma_alloc_coherent(dev,

			buf->page_list[i].buf = dma_zalloc_coherent(dev,

								  page_size, &t,

								  GFP_KERNEL);
@@ -228,7 +227,6 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct, 
				goto err_free;



			buf->page_list[i].map = t;

			memset(buf->page_list[i].buf, 0, page_size);

		}

	}