Commit d89d329a authored by Tomer Tayar's avatar Tomer Tayar Committed by Oded Gabbay
Browse files

accel/habanalabs: tiny refactor of hl_map_dmabuf() 



alloc_sgt_from_device_pages() includes relatively many parameters, and
in a subsequent change another offset parameter is going to be added.
Using structure fields directly when calling this function, and in
hl_map_dmabuf() it is done twice, makes it a little bit difficult to
understand the meaning of the parameters.
To make it clearer, assign the required values into local variables with
explicit names, and use the variables when calling the function.

Signed-off-by: default avatarTomer Tayar <ttayar@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 0b75cb5b

drivers/accel/habanalabs/common/memory.c

+15 −17
Original line number Diff line number Diff line
@@ -1699,6 +1699,7 @@ static int hl_dmabuf_attach(struct dma_buf *dmabuf, 
static struct sg_table *hl_map_dmabuf(struct dma_buf_attachment *attachment,

					enum dma_data_direction dir)

{

	u64 *pages, npages, page_size, exported_size;

	struct dma_buf *dma_buf = attachment->dmabuf;

	struct hl_vm_phys_pg_pack *phys_pg_pack;

	struct hl_dmabuf_priv *hl_dmabuf;
@@ -1707,30 +1708,27 @@ static struct sg_table *hl_map_dmabuf(struct dma_buf_attachment *attachment, 


	hl_dmabuf = dma_buf->priv;

	hdev = hl_dmabuf->ctx->hdev;

	phys_pg_pack = hl_dmabuf->phys_pg_pack;



	if (!attachment->peer2peer) {

		dev_dbg(hdev->dev, "Failed to map dmabuf because p2p is disabled\n");

		return ERR_PTR(-EPERM);

	}



	if (phys_pg_pack)

		sgt = alloc_sgt_from_device_pages(hdev,

						phys_pg_pack->pages,

						phys_pg_pack->npages,

						phys_pg_pack->page_size,

						hl_dmabuf->dmabuf->size,

						attachment->dev,

						dir);

	else

		sgt = alloc_sgt_from_device_pages(hdev,

						&hl_dmabuf->device_address,

						1,

						hl_dmabuf->dmabuf->size,

						hl_dmabuf->dmabuf->size,

						attachment->dev,

						dir);

	exported_size = hl_dmabuf->dmabuf->size;

	phys_pg_pack = hl_dmabuf->phys_pg_pack;



	if (phys_pg_pack) {

		pages = phys_pg_pack->pages;

		npages = phys_pg_pack->npages;

		page_size = phys_pg_pack->page_size;

	} else {

		pages = &hl_dmabuf->device_address;

		npages = 1;

		page_size = hl_dmabuf->dmabuf->size;

	}



	sgt = alloc_sgt_from_device_pages(hdev, pages, npages, page_size, exported_size,

						attachment->dev, dir);

	if (IS_ERR(sgt))

		dev_err(hdev->dev, "failed (%ld) to initialize sgt for dmabuf\n", PTR_ERR(sgt));