Commit 1ee8e2ba authored by Zvika Yehudai's avatar Zvika Yehudai Committed by Oded Gabbay
Browse files

habanalabs: rename cb_mmap to mmap 



This function will be used for more mmap operations than just
mmaping CBs.

Signed-off-by: default avatarZvika Yehudai <zyehudai@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 40e35d19

drivers/misc/habanalabs/common/command_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma) 


	vma->vm_private_data = cb;



	rc = hdev->asic_funcs->cb_mmap(hdev, vma, cb->kernel_address,

	rc = hdev->asic_funcs->mmap(hdev, vma, cb->kernel_address,

					cb->bus_address, cb->size);

	if (rc) {

		spin_lock(&cb->lock);

drivers/misc/habanalabs/common/habanalabs.h

+2 −2
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ struct fw_load_mgr { 
 *                hw_fini and before CS rollback.

 * @suspend: handles IP specific H/W or SW changes for suspend.

 * @resume: handles IP specific H/W or SW changes for resume.

 * @cb_mmap: maps a CB.

 * @mmap: maps a memory.

 * @ring_doorbell: increment PI on a given QMAN.

 * @pqe_write: Write the PQ entry to the PQ. This is ASIC-specific

 *             function because the PQs are located in different memory areas
@@ -1143,7 +1143,7 @@ struct hl_asic_funcs { 
	void (*halt_engines)(struct hl_device *hdev, bool hard_reset);

	int (*suspend)(struct hl_device *hdev);

	int (*resume)(struct hl_device *hdev);

	int (*cb_mmap)(struct hl_device *hdev, struct vm_area_struct *vma,

	int (*mmap)(struct hl_device *hdev, struct vm_area_struct *vma,

			void *cpu_addr, dma_addr_t dma_addr, size_t size);

	void (*ring_doorbell)(struct hl_device *hdev, u32 hw_queue_id, u32 pi);

	void (*pqe_write)(struct hl_device *hdev, __le64 *pqe,

drivers/misc/habanalabs/gaudi/gaudi.c

+2 −2
Original line number Diff line number Diff line
@@ -4299,7 +4299,7 @@ static int gaudi_resume(struct hl_device *hdev) 
	return gaudi_init_iatu(hdev);

}



static int gaudi_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,

static int gaudi_mmap(struct hl_device *hdev, struct vm_area_struct *vma,

			void *cpu_addr, dma_addr_t dma_addr, size_t size)

{

	int rc;
@@ -9313,7 +9313,7 @@ static const struct hl_asic_funcs gaudi_funcs = { 
	.halt_engines = gaudi_halt_engines,

	.suspend = gaudi_suspend,

	.resume = gaudi_resume,

	.cb_mmap = gaudi_cb_mmap,

	.mmap = gaudi_mmap,

	.ring_doorbell = gaudi_ring_doorbell,

	.pqe_write = gaudi_pqe_write,

	.asic_dma_alloc_coherent = gaudi_dma_alloc_coherent,

drivers/misc/habanalabs/goya/goya.c

+2 −2
Original line number Diff line number Diff line
@@ -2798,7 +2798,7 @@ int goya_resume(struct hl_device *hdev) 
	return goya_init_iatu(hdev);

}



static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,

static int goya_mmap(struct hl_device *hdev, struct vm_area_struct *vma,

			void *cpu_addr, dma_addr_t dma_addr, size_t size)

{

	int rc;
@@ -5584,7 +5584,7 @@ static const struct hl_asic_funcs goya_funcs = { 
	.halt_engines = goya_halt_engines,

	.suspend = goya_suspend,

	.resume = goya_resume,

	.cb_mmap = goya_cb_mmap,

	.mmap = goya_mmap,

	.ring_doorbell = goya_ring_doorbell,

	.pqe_write = goya_pqe_write,

	.asic_dma_alloc_coherent = goya_dma_alloc_coherent,