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

accel/habanalabs: set hl_dmabuf_priv.device_address only when needed 



The device_address member of 'struct hl_dmabuf_priv' is used only when
virtual device memory is not supported and dma-buf is exported from
address.
Set the value of this field only when it is relevant, and add "phys" to
its name so it would be clearer that it can't be a device virtual
address.

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 bb644f61

drivers/accel/habanalabs/common/habanalabs.h

+4 −4
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ struct hl_cs_counters_atomic { 
 * @phys_pg_pack: pointer to physical page pack if the dma-buf was exported

 *                where virtual memory is supported.

 * @memhash_hnode: pointer to the memhash node. this object holds the export count.

 * @device_address: physical address of the device's memory. Relevant only

 * device_phys_addr: physical address of the device's memory. Relevant only

 *                   if phys_pg_pack is NULL (dma-buf was exported from address).

 *                   The total size can be taken from the dmabuf object.

 */
@@ -1820,7 +1820,7 @@ struct hl_dmabuf_priv { 
	struct hl_ctx			*ctx;

	struct hl_vm_phys_pg_pack	*phys_pg_pack;

	struct hl_vm_hash_node		*memhash_hnode;

	uint64_t			device_address;

	u64				device_phys_addr;

};



#define HL_CS_OUTCOME_HISTORY_LEN 256

drivers/accel/habanalabs/common/memory.c

+3 −3
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ static struct sg_table *hl_map_dmabuf(struct dma_buf_attachment *attachment, 
		npages = phys_pg_pack->npages;

		page_size = phys_pg_pack->page_size;

	} else {

		pages = &hl_dmabuf->device_address;

		pages = &hl_dmabuf->device_phys_addr;

		npages = 1;

		page_size = hl_dmabuf->dmabuf->size;

	}
@@ -2064,9 +2064,9 @@ static int export_dmabuf_from_addr(struct hl_ctx *ctx, u64 addr, u64 size, u64 o 
		rc = validate_export_params_no_mmu(hdev, export_addr, size);

		if (rc)

			goto err_free_dmabuf_wrapper;

	}



	hl_dmabuf->device_address = export_addr;

		hl_dmabuf->device_phys_addr = export_addr;

	}



	rc = export_dmabuf(ctx, hl_dmabuf, size, flags, dmabuf_fd);

	if (rc)