Commit a9d4ef64 authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: fix dma_addr passed to dma_mmap_coherent 



When doing dma_alloc_coherent in the driver, we add a certain hard-coded
offset to the DMA address before returning to the callee function. This
offset is needed when our device use this DMA address to perform
outbound transactions to the host.

However, if we want to map the DMA'able memory to the user via
dma_mmap_coherent(), we need to pass the original dma address, without
this offset. Otherwise, we will get erronouos mapping.

Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent f970d1d0

drivers/misc/habanalabs/gaudi/gaudi.c

+2 −1
Original line number Diff line number Diff line
@@ -4002,7 +4002,8 @@ static int gaudi_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma, 
	vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |

			VM_DONTCOPY | VM_NORESERVE;



	rc = dma_mmap_coherent(hdev->dev, vma, cpu_addr, dma_addr, size);

	rc = dma_mmap_coherent(hdev->dev, vma, cpu_addr,

				(dma_addr - HOST_PHYS_BASE), size);

	if (rc)

		dev_err(hdev->dev, "dma_mmap_coherent error %d", rc);

drivers/misc/habanalabs/goya/goya.c

+2 −1
Original line number Diff line number Diff line
@@ -2719,7 +2719,8 @@ static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma, 
	vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |

			VM_DONTCOPY | VM_NORESERVE;



	rc = dma_mmap_coherent(hdev->dev, vma, cpu_addr, dma_addr, size);

	rc = dma_mmap_coherent(hdev->dev, vma, cpu_addr,

				(dma_addr - HOST_PHYS_BASE), size);

	if (rc)

		dev_err(hdev->dev, "dma_mmap_coherent error %d", rc);